-# $Id$
-# $URL$
+# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
-
-linux-2.6-SVNBRANCH := 22
-linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/branches/22
-ipfwsrc-SVNPATH := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-10
-madwifi-SVNBRANCH := 0.9.4
+linux-2.6-BRANCH := 22
+linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-22-49
+madwifi-BRANCH := 0.9.4
madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
-nozomi-SVNPATH := http://svn.onelab.eu/nozomi/tags/nozomi-2.21-1
+iptables-BRANCH := 1.3.8
+iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/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
comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3
-planetlab-umts-tools-SVNPATH := http://svn.onelab.eu/planetlab-umts-tools/tags/planetlab-umts-tools-0.6-4
-iptables-SVNBRANCH := 1.3.8
-iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-10
-iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
-util-vserver-SVNBRANCH := scholz
-util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
+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-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-8
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.3-23
-NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
+# 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-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.3-32
+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-3
+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-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-0
+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
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-SVNBRANCH := 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-15
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-4
-drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-41
-www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1
-pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-1
-Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30
+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-25
+plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master
+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-5
+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/trunk
-ejabberd-SVNPATH := http://svn.planet-lab.org/svn/ejabberd/trunk
-sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10
-nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-1
-BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-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-5
-omf-SVNPATH := http://svn.planet-lab.org/svn/omf/tags/omf-5.3-1
-#
-BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1
-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-2
-MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-2
+###
+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-8
+###
+sfa-GITPATH := git://git.onelab.eu/sfa.git@master
+sface-GITPATH := git://git.onelab.eu/sface.git@master
+nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-3
+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-5
+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@master
+DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
-# locating the right test directory - see make tests_svnpath
-tests-SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-3
+# locating the right test directory - see make tests_gitpath
+tests-GITPATH := git://git.onelab.eu/tests.git@master