synced from1lk27 - lots of trunks

diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk
index 9f4ac1f..7205b6d 100644 (file)
--- a/wextoolbox-tags.mk
+++ b/wextoolbox-tags.mk
@@ -23,10 +23,10 @@ util-vserver-BUILD-FROM-SRPM := yes # tmp
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.216-3
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 # as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 (trunk).
-util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-12
+util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-13
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH             := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-11
+NodeManager-SVNPATH             := http://svn.planet-lab.org/svn/NodeManager/trunk
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@ -34,31 +34,31 @@ pf2slice-SVNPATH            := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
 vsys-BRANCH                    := 0.9
-vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
-vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
-PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-10
+vsys-GITPATH                   := git://git.onelab.eu/vsys@0.9
+vsys-scripts-GITPATH           := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-19
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi@PLCAPI-5.0-12
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-GITPATH                 := git://git.onelab.eu/plewww@plewww-4.3-46
+plewww-GITPATH                 := git://git.onelab.eu/plewww@master
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
-pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-6
+pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/trunk
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-SVNPATH              := http://svn.planet-lab.org/svn/pyaspects/tags/pyaspects-0.3-2
 ejabberd-SVNPATH               := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-5
+omf-GITPATH                    := git://git.onelab.eu/omf@master
 ###
 sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2
-BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-4
+BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/trunk
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9
 pyplnet-SVNPATH                        := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-6
-BootCD-SVNPATH                 := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-3
-VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-2
-BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-5
-MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-5
+BootCD-SVNPATH                 := http://svn.planet-lab.org/svn/BootCD/trunk
+VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/trunk
+BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/trunk
+MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/trunk
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-6
+tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-7

diff --git a/wextoolbox.mk b/wextoolbox.mk
index d686c18..e7bc7f7 100644 (file)
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -307,7 +307,7 @@ ALL += vsys-scripts
 #
 # plcapi
 #
-plcapi-MODULES := PLCAPI
+plcapi-MODULES := plcapi
 plcapi-SPEC := PLCAPI.spec
 ALL += plcapi
 IN_MYPLC += plcapi
@@ -324,7 +324,7 @@ IN_MYPLC += drupal
 #
 # use the plewww module instead
 #
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
 plewww-SPEC := plewww.spec
 ALL += plewww
 IN_MYPLC += plewww
@@ -430,6 +430,21 @@ IN_BOOTSTRAPFS += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
+#
+# OMF resource controller
+#
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_VSERVER += omf-resctl
+
+#
+# OMF exp controller
+#
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
+
 #
 # bootcd
 #
@@ -486,6 +501,26 @@ noderepo-RPMDATE := yes
 ALL += noderepo
 IN_MYPLC += noderepo
 
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
+
+slicerepo-MODULES := BootstrapFS 
+slicerepo-SPEC := slicerepo.spec
+slicerepo-RPMBUILD := bash ./rpmbuild.sh
+# package requires all embedded packages
+slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
+slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
@@ -497,7 +532,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor
+myplc-docs-MODULES := MyPLC plcapi NodeManager Monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs