synced from onelab

diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk
index e121954..636e219 100644 (file)
--- a/wextoolbox-tags.mk
+++ b/wextoolbox-tags.mk
@@ -11,24 +11,24 @@ spectools-GITPATH           := git://git.onelab.eu/spectools@spectools-2009_06_R1-1
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
 ###
-linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-15
+linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-16
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-SVNPATH                := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.8-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
+iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.16-2
 ###
 ipfw-GITPATH                   := git://git.onelab.eu/ipfw@ipfw-0.9-17
 ###
 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
+util-vserver-GITPATH           := git://git.onelab.eu/util-vserver.git@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-13
-NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
+util-vserver-pl-GITPATH                := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-15
+nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@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-15
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-16
 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
+codemux-GITPATH                        := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
 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
@@ -36,29 +36,29 @@ inotify-tools-SVNPATH               := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 vsys-BRANCH                    := 0.9
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.9-5
 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@master
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi@master
+drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-47
 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-7
+pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-8
 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@master
+pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@master
+ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
+omf-GITPATH                     := git://git.onelab.eu/omf.git@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-5
-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-4
-VserverReference-SVNPATH        := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-3
-BootstrapFS-SVNPATH             := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-6
-MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-6
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@BootManager-5.0-6
+pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
+pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-6
+bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@BootCD-5.0-4
+vserver-reference-GITPATH        := git://git.onelab.eu/vserver-reference.git@VserverReference-5.0-3
+bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@BootstrapFS-2.0-6
+myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-8
 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-7
+tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-8

diff --git a/wextoolbox.mk b/wextoolbox.mk
index e7bc7f7..e91e8a4 100644 (file)
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -207,7 +207,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 #
 # NodeUpdate
 #
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate
@@ -223,7 +223,7 @@ IN_BOOTSTRAPFS += ipod
 #
 # NodeManager
 #
-nodemanager-MODULES := NodeManager
+nodemanager-MODULES := nodemanager
 nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
 IN_BOOTSTRAPFS += nodemanager
@@ -239,7 +239,7 @@ IN_BOOTSTRAPFS += sshd
 #
 # codemux: Port 80 demux
 #
-codemux-MODULES := CoDemux
+codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
 #codemux-RPMBUILD := bash ./rpmbuild.sh
 ALL += codemux
@@ -384,6 +384,13 @@ pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
 #
+# ejabberd
+#
+ejabberd-MODULES := ejabberd
+ejabberd-SPEC := ejabberd.spec
+ejabberd-BUILD-FROM-SRPM := yes
+ALL += ejabberd
+
 # sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
 build_sfa=false
 
@@ -407,7 +414,7 @@ IN_MYPLC += nodeconfig
 #
 # bootmanager
 #
-bootmanager-MODULES := BootManager
+bootmanager-MODULES := bootmanager
 bootmanager-SPEC := bootmanager.spec
 ALL += bootmanager
 IN_MYPLC += bootmanager
@@ -448,7 +455,7 @@ ALL += omf-expctl
 #
 # bootcd
 #
-bootcd-MODULES := BootCD build
+bootcd-MODULES := bootcd build
 bootcd-SPEC := bootcd.spec
 bootcd-RPMBUILD := bash ./rpmbuild.sh
 bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
@@ -460,7 +467,7 @@ IN_MYPLC += bootcd
 #
 # vserver : reference image for slices
 #
-vserver-MODULES := VserverReference build
+vserver-MODULES := vserver-reference build
 vserver-SPEC := vserver-reference.spec
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
@@ -471,7 +478,7 @@ IN_BOOTSTRAPFS += vserver
 #
 # bootstrapfs
 #
-bootstrapfs-MODULES := BootstrapFS build
+bootstrapfs-MODULES := bootstrapfs build
 bootstrapfs-SPEC := bootstrapfs.spec
 bootstrapfs-RPMBUILD := bash ./rpmbuild.sh
 bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
@@ -489,7 +496,7 @@ NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
 SPACE=$(subst x, ,x)
 NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
-noderepo-MODULES := BootstrapFS 
+noderepo-MODULES := bootstrapfs
 noderepo-SPEC := noderepo.spec
 noderepo-RPMBUILD := bash ./rpmbuild.sh
 # package requires all embedded packages
@@ -510,7 +517,7 @@ SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
 SPACE=$(subst x, ,x)
 SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
 
-slicerepo-MODULES := BootstrapFS 
+slicerepo-MODULES := bootstrapfs
 slicerepo-SPEC := slicerepo.spec
 slicerepo-RPMBUILD := bash ./rpmbuild.sh
 # package requires all embedded packages
@@ -524,7 +531,7 @@ ALL += slicerepo
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-myplc-MODULES := MyPLC
+myplc-MODULES := myplc
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
@@ -532,12 +539,12 @@ 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
 
 # using some other name than myplc-release, as this is a make target already
-release-MODULES := MyPLC
+release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release