Merge branch 'master' of ssh://git.planet-lab.org/git/build

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index b654c2b..e56a5b3 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -1,7 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 ###
-linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-24
+linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-26
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM        := yes # tmp
@@ -32,7 +32,7 @@ vsys-scripts-GITPATH          := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-20
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-15
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
-www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
+www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/trunk
 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
@@ -40,11 +40,11 @@ pyopenssl-SVNPATH           := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-0
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-7
+omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 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-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-11
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12
 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

diff --git a/onelab-tags.mk b/onelab-tags.mk
index f54106a..0757b0a 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -34,7 +34,7 @@ vsys-scripts-GITPATH          := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-20
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-15
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
-www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
+www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/trunk
 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
@@ -42,11 +42,11 @@ pyopenssl-SVNPATH           := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-0
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-7
+omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 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-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-11
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12
 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

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 6d25842..4719e11 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -1,6 +1,6 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-24
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-26
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
@@ -36,7 +36,7 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
 ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-7
+omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 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
@@ -44,7 +44,7 @@ pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-8
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-11
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@BootCD-5.0-4
 vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@VserverReference-5.0-3
 bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 56603b8..0fcb936 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -36,11 +36,11 @@ pyopenssl-SVNPATH           := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
 ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-7
+omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-8
 ###
 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-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-11
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@BootCD-5.0-4

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 5a5a118..27ae105 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -37,11 +37,11 @@ pyopenssl-SVNPATH           := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
 ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-7
+omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-15
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-11
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@BootCD-5.0-4