From 9cbb37a7d7e7036f2c3e2555833ad77ccb4876b6 Mon Sep 17 00:00:00 2001 From: Daniel Joseph Barnhart Clark Date: Tue, 10 Oct 2006 03:19:54 +0000 Subject: EncapPackages: Switch to using elementtree on client, as there is difficulty compiling libxml2+libxslt+lxml on some platforms. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2420 ce84e21b-d406-0410-9b95-82705330c041 --- encap/src/Makefile | 12 +--- encap/src/encap-profiles/Makefile | 11 ++-- .../src/encap-profiles/bcfg2-elementtree-1.2.6.ep | 68 ++++++++++++++++++++++ encap/src/makeself-dist/makedist.sh | 6 +- 4 files changed, 78 insertions(+), 19 deletions(-) create mode 100644 encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep (limited to 'encap') diff --git a/encap/src/Makefile b/encap/src/Makefile index fec6f66b7..71ce899c9 100644 --- a/encap/src/Makefile +++ b/encap/src/Makefile @@ -17,20 +17,10 @@ all : $(MAKE) -C ./makeself-dist all if [ ! -d $(DEST) ]; then $(MKINSTALLDIRS) $(DEST); fi cp makeself-dist/*.run $(DEST) - cp encap-profiles/*doc*.tar.gz $(DEST) - cp encap-profiles/bcfg2-cheetah-[0-9]*.tar.gz $(DEST) - -cp encap-profiles/bcfg2-glib-*.tar.gz $(DEST) - -cp encap-profiles/bcfg2-gamin-*.tar.gz $(DEST) + cp encap-profiles/*.tar.gz $(DEST) @printf "\n\n### encap build finished...\n" @printf "## Client install self-extracting/installing package is:\n" @printf "%s\n" "`ls $(DEST)/*.run 2>/dev/null`" - @printf "# Use 'epkg -i ' to install encap packages...\n" - @printf "## Doc encap packages are:\n" - -@(ls $(DEST)/*doc*.tar.gz 2>/dev/null) - @printf "## Server encap packages, if built (GNU/Linux only), are:\n" - -@printf "%s\n" "`ls $(DEST)/bcfg2-glib-*.tar.gz 2>/dev/null`" - -@printf "%s\n" "`ls $(DEST)/bcfg2-gamin-*.tar.gz 2>/dev/null`" - -@printf "%s\n" "`ls $(DEST)/bcfg2-cheetah-[0-9]*.tar.gz 2>/dev/null`" @printf "\n" clean : diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile index 3ddf1cf31..4378ba451 100644 --- a/encap/src/encap-profiles/Makefile +++ b/encap/src/encap-profiles/Makefile @@ -16,6 +16,7 @@ PAGER ?= more BCFG2 := $(basename $(wildcard bcfg2-[0-9].[0-9]*.ep)) BCFG2_CHEETAH := $(basename $(wildcard bcfg2-cheetah-[0-9].[0-9]*.ep)) BCFG2_CHEETAH_DOC := $(basename $(wildcard bcfg2-cheetah-doc-*.ep)) +BCFG2_ELEMENTTREE := $(basename $(wildcard bcfg2-elementtree-*.ep)) BCFG2_GAMIN := $(basename $(wildcard bcfg2-gamin-*.ep)) BCFG2_GLIB := $(basename $(wildcard bcfg2-glib-*.ep)) BCFG2_GZIP := $(basename $(wildcard bcfg2-gzip-*.ep)) @@ -37,10 +38,12 @@ OSTIARTY := $(basename $(wildcard ostiary-[0-9].[0-9]*.ep)) OSTIARTY_DOC := $(basename $(wildcard ostiary-doc-*.ep)) PATCH := $(basename $(wildcard patch-*.ep)) -sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_CHEETAH_DOC) $(BCFG2_GZIP) $(BCFG2_LIBXML2) $(BCFG2_LIBXSLT) $(BCFG2_LXML) $(BCFG2_OPENSSL) $(BCFG2_PKG_CONFIG) $(BCFG2_PYOPENSSL) $(BCFG2_PYREX) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_ZLIB) $(DAEMONTOOLS) $(DAEMONTOOLS_DOC) $(MAKESELF) $(OSTIARTY) $(OSTIARTY_DOC) $(PATCH)) +sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_ELEMENTTREE) $(BCFG2_GZIP) $(BCFG2_OPENSSL) $(BCFG2_PKG_CONFIG) $(BCFG2_PYOPENSSL) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_ZLIB) $(DAEMONTOOLS) $(MAKESELF) $(OSTIARTY) $(PATCH)) sources_sh := $(sort $(M4)) +sources_server := $(sort $(BCFG2_GLIB) $(BCFG2_GAMIN) $(BCFG2_LIBXML2) $(BCFG2_LIBXSLT) $(BCFG2_LXML) $(BCFG2_CHEETAH_DOC) $(BCFG2_PYREX) $(DAEMONTOOLS_DOC) $(OSTIARTY_DOC)) + # Only compile bcfg2-glib and bcfg2-gamin (needed by bcfg2 server) on Linux # (Gamin only supports Linux), and only compile bcfg2-python-apt on known # Debian and Ubuntu systems (as python-apt is distribution-specific) @@ -51,19 +54,19 @@ DISTRO := $(shell cat /etc/issue | grep ^[a-zA-Z] | head -1) endif ifeq ($(DISTRO),Debian GNU/Linux 3.1 \n \l) -sources_ep += $(BCFG2_GLIB) $(BCFG2_GAMIN) +sources_ep += $(sources_server) BCFG2_PYTHON_APT = bcfg2-python-apt-0.5.10 OS ?= linux_debian_sarge endif ifeq ($(DISTRO),Debian GNU/Linux testing/unstable \n \l) -sources_ep += $(BCFG2_GLIB) $(BCFG2_GAMIN) +sources_ep += $(sources_server) BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.19 OS ?= linux_debian_sid endif ifeq ($(DISTRO),Ubuntu 6.06.1 LTS \n \l) -sources_ep += $(BCFG2_GLIB) $(BCFG2_GAMIN) +sources_ep += $(sources_server) BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.16.2ubuntu8 OS ?= linux_ubuntu_dapper endif diff --git a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep new file mode 100644 index 000000000..a0897fe8a --- /dev/null +++ b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep @@ -0,0 +1,68 @@ + + + + + + + + + + + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE + +PLATFORM_ENDIF + + + + + + +/usr/local/lib/bcfg2/bin/python setup.py build \ +--build-base=${builddir}/build + + + +/usr/local/lib/bcfg2/bin/python setup.py install \ +--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 + + + +/usr/local/lib/bcfg2/bin/python setup.py clean + + + + + +chmod -R o+r lib/bcfg2 +# Make "this encap is installed" sentinal file available in /usr/local/var/encap +test -d var || mkdir var +test -d var/encap || mkdir var/encap +touch var/encap/${ENCAP_PKGNAME} + + + +description elementtree - Light-weight toolkit for XML processing + + + diff --git a/encap/src/makeself-dist/makedist.sh b/encap/src/makeself-dist/makedist.sh index d7d58014a..8c80f2e14 100755 --- a/encap/src/makeself-dist/makedist.sh +++ b/encap/src/makeself-dist/makedist.sh @@ -48,9 +48,7 @@ tar -cf $DISTDIR/epkg.tar $EPKGDIR/* # Copy bcfg2 and client deps to $DISTDIR BCFG2="`basename $EPDIR/bcfg2-[0-9].[0-9]*-encap-*.tar.gz`" -BCFG2_LIBXML2="`basename $EPDIR/bcfg2-libxml2-*-encap-*.tar.gz`" -BCFG2_LIBXSLT="`basename $EPDIR/bcfg2-libxslt-*-encap-*.tar.gz`" -BCFG2_LXML="`basename $EPDIR/bcfg2-lxml-*-encap-*.tar.gz`" +BCFG2_ELEMENTTREE="`basename $EPDIR/bcfg2-elementtree-*-encap-*.tar.gz`" BCFG2_PYTHON="`basename $EPDIR/bcfg2-python-[0-9].[0-9]*-encap-*.tar.gz`" DAEMONTOOLS="`basename $EPDIR/daemontools-[0-9].[0-9]*-encap-*.tar.gz`" OSTIARTY="`basename $EPDIR/ostiary-[0-9].[0-9]*-encap-*.tar.gz`" @@ -60,7 +58,7 @@ if [ "${BCFG2_PYTHON_APT_TMP}x" != 'bcfg2-python-apt-*-encap-*.tar.gzx' ]; then BCFG2_PYTHON_APT="$BCFG2_PYTHON_APT_TMP" fi -BCFG2DEPS="$BCFG2_LIBXML2 $BCFG2_LIBXSLT $BCFG2_LXML $BCFG2_PYTHON $BCFG2_PYTHON_APT" +BCFG2DEPS="$BCFG2_ELEMENTTREE $BCFG2_PYTHON $BCFG2_PYTHON_APT" FILES="$BCFG2DEPS $BCFG2 $DAEMONTOOLS $OSTIARTY" -- cgit v1.2.3-1-g7c22