EncapPackages: seperating out server stuff

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3332 ce84e21b-d406-0410-9b95-82705330c041

18 files changed, 23 insertions, 34 deletions

diff --git a/encap/epkg/Makefile b/encap/epkg/Makefile
index acebb96e6..9ea9c12ee 100644
--- a/encap/epkg/Makefile
+++ b/encap/epkg/Makefile
@@ -14,9 +14,9 @@ export PATH LDFLAGS CPPFLAGS
 
 ZLIB = zlib-1.2.3
 LIBTAR = libtar-1.2.11
-CURL = curl-7.15.4
+CURL = curl-7.16.2
 FGET = fget-1.3.3
-EXPAT = expat-2.0.0
+EXPAT = expat-2.0.1
 EPKG = epkg-2.3.9
 
 all: zlib libtar curl fget expat epkg
@@ -37,4 +37,5 @@ expat:
 	cd ${EXPAT} && ./configure --disable-shared --prefix=${PREFIX} && $(MAKE) && $(MAKE) install
 
 epkg:
+	test -d $(ENCAPDIR)/$(EPKG) && rm -rf $(ENCAPDIR)/$(EPKG)
 	cd ${EPKG} && ./configure && $(MAKE) && $(MAKE) install
diff --git a/encap/epkg/README b/encap/epkg/README
index 30ef2fd4f..7fb3bd856 100644
--- a/encap/epkg/README
+++ b/encap/epkg/README
@@ -9,8 +9,11 @@ decompress/untar the distributions, and then run make (or gmake on
 non-GNU platforms)
 
 All of the software is available from:
- * http://www.dclark.us/mirror/epkg-deps
-(or Google for it).
+ * http://mirror.opensysadmin.com/epkg-deps/epkg-with-all-deps.tar.gz
+You will want to download and extract this file to this directory, as
+it contains symbloic links to the README and Makefile in this directory.
+After that is complete, do "cd epkg-with-all-deps" and then "make" or
+"gmake" (depending on what GNU Make is called on your machine).
 
 Once you have a working epkg distribution, you should:
  * cd /usr/local/encap
diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile
index 8e55cbebf..966999083 100644
--- a/encap/src/encap-profiles/Makefile
+++ b/encap/src/encap-profiles/Makefile
@@ -15,39 +15,27 @@ 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))
-BCFG2_LIBXML2 := $(basename $(wildcard bcfg2-libxml2-*.ep))
-BCFG2_LIBXSLT := $(basename $(wildcard bcfg2-libxslt-*.ep))
-BCFG2_LXML := $(basename $(wildcard bcfg2-lxml-*.ep))
 BCFG2_M2CRYPTO := $(basename $(wildcard bcfg2-m2crypto-*.ep))
 BCFG2_OPENSSL := $(basename $(wildcard bcfg2-openssl-*.ep))
 BCFG2_PKG_CONFIG := $(basename $(wildcard bcfg2-pkg-config-*.ep))
-BCFG2_PYREX := $(basename $(wildcard bcfg2-pyrex-*.ep))
 BCFG2_PYTHON := $(basename $(wildcard bcfg2-python-[0-9].[0-9]*.ep))
 BCFG2_READLINE := $(basename $(wildcard bcfg2-readline-*.ep))
-BCFG2_SETUPTOOLS := $(basename $(wildcard bcfg2-setuptools-*.ep))
 BCFG2_SWIG := $(basename $(wildcard bcfg2-swig-*.ep))
 BCFG2_ZLIB := $(basename $(wildcard bcfg2-zlib-*.ep))
 M4 := $(basename $(wildcard m4-*.sh))
 MAKESELF := $(basename $(wildcard makeself-*.ep))
 OSTIARTY := $(basename $(wildcard ostiary-[0-9].[0-9]*.ep))
-OSTIARTY_DOC := $(basename $(wildcard ostiary-doc-*.ep))
 PATCH := $(basename $(wildcard patch-*.ep))
 RUNIT := $(basename $(wildcard runit-[0-9].[0-9]*.ep))
 
-sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_ELEMENTTREE) $(BCFG2_GZIP) $(BCFG2_M2CRYPTO) $(BCFG2_OPENSSL) $(BCFG2_PKG_CONFIG) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_SETUPTOOLS) $(BCFG2_SWIG) $(BCFG2_ZLIB) $(MAKESELF) $(OSTIARTY) $(PATCH) $(RUNIT))
+sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_ELEMENTTREE) $(BCFG2_GZIP) $(BCFG2_M2CRYPTO) $(BCFG2_OPENSSL) $(BCFG2_PKG_CONFIG) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_SWIG) $(BCFG2_ZLIB) $(MAKESELF) $(OSTIARTY) $(PATCH) $(RUNIT))
 
-sources_sh := $(sort $(M4))
+sources_sh := $(M4)
 
-sources_server := $(sort $(BCFG2_GLIB) $(BCFG2_GAMIN) $(BCFG2_LIBXML2) $(BCFG2_LIBXSLT) $(BCFG2_LXML) $(BCFG2_CHEETAH_DOC) $(BCFG2_PYREX) $(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)
+# Only compile bcfg2-python-apt on known Debian and Ubuntu 
+# systems (as python-apt is distribution-specific)
 UNAME := $(shell uname)
 
 ifeq ($(UNAME),Linux)
@@ -55,13 +43,11 @@ DISTRO := $(shell cat /etc/issue | grep ^[a-zA-Z] | head -1)
 endif
 
 ifeq ($(DISTRO),Debian GNU/Linux 3.1 \n \l)
-sources_ep += $(sources_server)
 BCFG2_PYTHON_APT = bcfg2-python-apt-0.5.10
 OS ?= linux_debian_sarge
 endif
 
 ifeq ($(DISTRO),Debian GNU/Linux 4.0 \n \l)
-sources_ep += $(sources_server)
 BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.19
 OS ?= linux_debian_etch
 endif
@@ -165,8 +151,7 @@ rename : encaps
 				mv ./$${OLDNAME} ./$${NEWNAME}; \
 			fi; \
 		done; \
-	fi
-	
+	fi	
 	for OLDNAME in `(ls . | grep .*-doc-.*-encap-.*.tar.gz) || break`; do \
 		NEWNAME="`printf "%s\n" "$${OLDNAME}" \
 			| awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' \
@@ -174,7 +159,7 @@ rename : encaps
 		if [ "$${OLDNAME}x" != "$${NEWNAME}x" ]; then \
 			mv ./$${OLDNAME} ./$${NEWNAME}; \
 		fi; \
-	done;
+	done
 
 clean :
 	-(rm ./*.log; rm ./*.packaged; rm ./*.gz; rm ./*~)
diff --git a/encap/src/encap-profiles/bcfg2-0.9.4.ep b/encap/src/encap-profiles/bcfg2-0.9.4.ep
index 101802f66..8eacff249 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.4.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.4.ep
@@ -19,7 +19,7 @@
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-elementtree-1.2.6" />
 <prereq package="bcfg2-m2crypto-0.17" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
index 297578dd9..000cf09e9 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
index 7c9479c8e..051ecdfeb 100644
--- a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
+++ b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="PATH"
diff --git a/encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep b/encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep
index b6f2897d6..ab41d5099 100644
--- a/encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep
+++ b/encap/src/encap-profiles/bcfg2-lxml-1.2.1.ep
@@ -14,7 +14,7 @@
 <prereq package="bcfg2-pyrex-0.9.5.1a" />
 <prereq package="bcfg2-libxml2-2.6.29" />
 <prereq package="bcfg2-libxslt-1.1.21" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
index e3ddce1c2..aa082e7ac 100644
--- a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
+++ b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
@@ -13,7 +13,7 @@
 <prereq package="bcfg2-openssl-0.9.8e" />
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-swig-1.3.31" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep b/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep
index 3037e9e5e..9386ddf76 100644
--- a/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep
+++ b/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
index 18aaff1da..cfa97013c 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
index dbe44a3c9..391832c8f 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
index 3638b412f..2ca5512b6 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
+<!-- <prereq package="bcfg2-setuptools-0.6c6" /> -->
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-doc-0.9.16a1.ep b/encap/src/encap-profiles/server/bcfg2-cheetah-doc-0.9.16a1.ep
index 1c671b58b..1c671b58b 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-doc-0.9.16a1.ep
+++ b/encap/src/encap-profiles/server/bcfg2-cheetah-doc-0.9.16a1.ep
diff --git a/encap/src/encap-profiles/bcfg2-gamin-0.1.8.ep b/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep
index fddba59c4..fddba59c4 100644
--- a/encap/src/encap-profiles/bcfg2-gamin-0.1.8.ep
+++ b/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep
diff --git a/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep b/encap/src/encap-profiles/server/bcfg2-glib-2.12.9.ep
index a94d1ebaf..a94d1ebaf 100644
--- a/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
+++ b/encap/src/encap-profiles/server/bcfg2-glib-2.12.9.ep
diff --git a/encap/src/encap-profiles/bcfg2-libxml2-2.6.29.ep b/encap/src/encap-profiles/server/bcfg2-libxml2-2.6.29.ep
index 441af569e..441af569e 100644
--- a/encap/src/encap-profiles/bcfg2-libxml2-2.6.29.ep
+++ b/encap/src/encap-profiles/server/bcfg2-libxml2-2.6.29.ep
diff --git a/encap/src/encap-profiles/bcfg2-libxslt-1.1.21.ep b/encap/src/encap-profiles/server/bcfg2-libxslt-1.1.21.ep
index fdcad4e5c..fdcad4e5c 100644
--- a/encap/src/encap-profiles/bcfg2-libxslt-1.1.21.ep
+++ b/encap/src/encap-profiles/server/bcfg2-libxslt-1.1.21.ep
diff --git a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep b/encap/src/encap-profiles/server/bcfg2-setuptools-0.6c6.ep
index 3678a8dd5..3678a8dd5 100644
--- a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
+++ b/encap/src/encap-profiles/server/bcfg2-setuptools-0.6c6.ep