Merge branch 'master' of ssh://git.onelab.eu/git/build

[build.git] / onelab-tags.mk

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 662d0af..0833e03 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -1,5 +1,3 @@
-# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-
 ###
 linux-2.6-BRANCH               := 32
 linux-2.6-GITPATH               := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-36
@@ -13,10 +11,10 @@ planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@
 util-vserver-GITPATH            := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-21
 libnl-GITPATH                  := git://git.onelab.eu/libnl.git@libnl-1.1-2
 util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-29
-nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-10
+nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@master
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 plnode-utils-GITPATH            := git://git.onelab.eu/plnode-utils.git@plnode-utils-0.2-2
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-5.2-9
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master
 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-15
 fprobe-ulog-GITPATH             := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-3
@@ -38,7 +36,7 @@ PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-GITPATH               := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
 pyaspects-GITPATH               := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-3
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.2-3
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.2-1
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@master
 pypcilib-GITPATH                := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11
 pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-18
 ###
@@ -52,10 +50,10 @@ myplc-GITPATH                   := git://git.onelab.eu/myplc.git@master
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 #
-sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-1
-sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-9
+sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-2
+#sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-9
 #
 myslice-GITPATH                        := git://git.onelab.eu/myslice.git@master
 manifold-GITPATH               := git://git.onelab.eu/manifold.git@devel
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.planet-lab.org/tests.git@master
+tests-GITPATH                   := git://git.onelab.eu/tests.git@master