let's roll our own yum to remove external dhozac binary repo dep.

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index 603703a..35d23db 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -34,5 +34,12 @@ myplc-GITPATH                   := git://git.verivue.com/planetlab/myplc@myplc-4
 pyopenssl-GITPATH              := git://git.verivue.com/planetlab/pyopenssl.git@pyopenssl-0.9-1
 monitor-GITPATH                 := git://git.verivue.com/planetlab/monitor.git@Monitor-3.0-29
 
 pyopenssl-GITPATH              := git://git.verivue.com/planetlab/pyopenssl.git@pyopenssl-0.9-1
 monitor-GITPATH                 := git://git.verivue.com/planetlab/monitor.git@Monitor-3.0-29
 

+ifeq "$(DISTRONAME)" "centos5"
+yum-SVNPATH                    := http://svn.planet-lab.org/svn/yum/branches/centos5
+endif
+ifeq "$(DISTRONAME)" "sl6"
+yum-SVNPATH                    := http://svn.planet-lab.org/svn/yum/branches/rhel6
+endif
+

 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                  := git://git.verivue.com/tests.git@verivue
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                  := git://git.verivue.com/tests.git@verivue

diff --git a/coblitz.mk b/coblitz.mk
index 3afe5ba..130ae85 100644 (file)
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -375,3 +375,13 @@ release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release

+
+ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk"
+ifeq "$(DISTRONAME)" "centos5"
+# chroot supported yum
+yum-MODULES := yum
+yum-SPEC := yum.spec
+yum-BUILD-FROM-SRPM := yes
+ALL += yum
+endif
+endif

diff --git a/config.coblitz/devel.pkgs b/config.coblitz/devel.pkgs
index 3e4d55e..ff2112d 100644 (file)
--- a/config.coblitz/devel.pkgs
+++ b/config.coblitz/devel.pkgs
@@ -105,3 +105,5 @@ package: make git
 package=centos5: parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel device-mapper libselinux-devel libsepol-devel libnl-devel
 # for log4*
 package: log4c-devel log4cpp-devel log4j erlang-log4erl
 package=centos5: parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel device-mapper libselinux-devel libsepol-devel libnl-devel
 # for log4*
 package: log4c-devel log4cpp-devel log4j erlang-log4erl

+# for yum
+package:  gettext intltool