Merge commit 'origin/master'

diff --git a/module-tools.py b/module-tools.py
index 907fe3d..b1a0d57 100755 (executable)
--- a/module-tools.py
+++ b/module-tools.py
@@ -20,6 +20,7 @@ RENAMED_SVN_MODULES = {
     "MyPLC": "myplc",
     "CoDemux": "codemux",
     "NodeManager": "nodemanager"
+    "NodeUpdate": "nodeupdate"
     }
 
 def svn_to_git_name(module):

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 52a064a..7b96eeb 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -3,9 +3,9 @@
 ###
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-15
 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-GITPATH                := git://git.onelab.eu/iptables.git@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
 ###
@@ -13,11 +13,11 @@ comgt-SVNPATH                       := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-GITPATH   := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5
 ###
 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-14
-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-14
+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-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
@@ -45,8 +45,8 @@ 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-GITPATH             := git://git.onelab.eu/bootmanager.git@BootManager-5.0-6
-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
+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

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 917fa68..8f73b79 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -5,8 +5,8 @@ linux-2.6-GITPATH               := git://git.onelab.eu/linux-2.6.git@linux-2.6-22-48
 madwifi-BRANCH                 := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
 iptables-BRANCH                        := 1.3.8
-iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
+iptables-GITPATH               := git://git.onelab.eu/iptables.git@iptables-1.3.8-12
+iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.16-2
 ###
 ipfw-GITPATH                   := git://git.onelab.eu/ipfw@ipfw-0.9-17
 nozomi-GITPATH                 := git://git.onelab.eu/nozomi@nozomi-2.21-1
@@ -14,12 +14,12 @@ comgt-SVNPATH                       := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-GITPATH   := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5
 ###
 util-vserver-BRANCH            := scholz
-util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
+util-vserver-GITPATH           := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 # 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4 (trunk).
 util-vserver-pl-BRANCH         := 0.3
-util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-31
-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.3-31
+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-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
@@ -47,8 +47,8 @@ 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-GITPATH             := git://git.onelab.eu/bootmanager.git@BootManager-5.0-6
-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
+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

diff --git a/onelab.mk b/onelab.mk
index be638f1..88562d5 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -175,7 +175,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 #
 # NodeUpdate
 #
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 775ae53..b0f27dc 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -1,53 +1,53 @@
 # 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-15
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-15
 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-GITPATH               := git://git.planet-lab.org/iptables.git@iptables-1.4.8-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.33-2
+iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.33-2
 iproute-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.planet-lab.org/util-vserver.git@util-vserver-0.30.216-3
 util-vserver-BUILD-FROM-SRPM := yes    # tmp
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-14
-NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
+util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-14
+nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-16
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-16
 # Trellis-specific NodeManager plugins
 NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
 #
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-codemux-GITPATH                        := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
+codemux-GITPATH                        := git://git.planet-lab.org/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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
 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
+vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.9-5
+vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-19
+plcapi-GITPATH                  := git://git.planet-lab.org/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-47
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-47
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
 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-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.3-2
-ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-6
+pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.3-2
+ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+omf-GITPATH                    := git://git.planet-lab.org/omf@omf-5.3-6
 ###
 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
-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
+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.onelab.eu/pcucontrol.git@pcucontrol-1.0-8
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@BootManager-5.0-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-7
+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-6
+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
+myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@MyPLC-5.0-7
 # 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.planet-lab.org/tests.git@tests-5.0-7

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index bdaf462..e8b5f8e 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -1,53 +1,53 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@rhel6
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@rhel6
 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-GITPATH               := git://git.planet-lab.org/iptables.git@iptables-1.4.8-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.33-2
+iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.33-2
 iproute-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.planet-lab.org/util-vserver.git@util-vserver-0.30.216-3
 util-vserver-BUILD-FROM-SRPM := yes    # tmp
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-14
-NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
+util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-14
+nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-16
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-16
 # Trellis-specific NodeManager plugins
 NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-codemux-GITPATH                        := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
+codemux-GITPATH                        := git://git.planet-lab.org/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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
 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
+vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.9-5
+vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-19
+plcapi-GITPATH                  := git://git.planet-lab.org/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-47
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@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-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-8
+pcucontrol-GITPATH              := git://git.planet-lab.org/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-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.3-2
-ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-6
+pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.3-2
+ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+omf-GITPATH                    := git://git.planet-lab.org/omf@omf-5.3-6
 ###
 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-6
-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-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-7
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@BootManager-5.0-6
+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
+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
+myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@MyPLC-5.0-7
 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.planet-lab.org/tests.git@tests-5.0-7

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 61d01bd..33aad74 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -1,54 +1,54 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 linux-2.6-BRANCH               := 22
-linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-22-48
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-22-48
 madwifi-BRANCH         := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
 iptables-BRANCH                := 1.3.8
-iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
+iptables-GITPATH               := git://git.planet-lab.org/iptables.git@iptables-1.3.8-12
+iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.16-2
 util-vserver-BRANCH            := scholz
-util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
+util-vserver-GITPATH           := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 # 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4 (trunk).
 util-vserver-pl-BRANCH         := 0.3
-util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-31
-NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
+util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.3-31
+nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-16
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-16
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-codemux-GITPATH                        := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
+codemux-GITPATH                        := git://git.planet-lab.org/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
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
 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
+vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.9-5
+vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-19
+plcapi-GITPATH                  := git://git.planet-lab.org/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-47
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@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-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-8
+pcucontrol-GITPATH              := git://git.planet-lab.org/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-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.3-2
-ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-6
+pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.3-2
+ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+omf-GITPATH                    := git://git.planet-lab.org/omf@omf-5.3-6
 ###
 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-6
-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-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-7
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@BootManager-5.0-6
+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
+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
+myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@MyPLC-5.0-7
 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.planet-lab.org/tests.git@tests-5.0-7

diff --git a/planetlab.mk b/planetlab.mk
index 96b3f58..7eb2a01 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -95,7 +95,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 #
 # NodeUpdate
 #
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate