-# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-
-boost-GITPATH := git://git.onelab.eu/boost@boost-1.37.0-6
-gnuradio-GITPATH := git://git.onelab.eu/gnuradio
-bbn_80211-GITPATH := git://git.onelab.eu/bbn_80211@bbn_80211-3.2.2-3
+#
+#boost-GITPATH := git://git.onelab.eu/boost.git@boost-1.37.0-6
+#gnuradio-GITPATH := git://git.onelab.eu/gnuradio@master
+bbn_80211-GITPATH := git://git.onelab.eu/bbn_80211@master
crunchxml-GITPATH := git://git.onelab.eu/crunchxml@crunchxml-1.1-1
spectools-GITPATH := git://git.onelab.eu/spectools@spectools-2009_06_R1-1
#turned off
#sge-GITPATH := git://git.onelab.eu/sge/tags/sge-6.2.3-1
+#sge-GITPATH := git://git.onelab.eu/sge/trunk
-# 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-13
-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
+linux-2.6-BRANCH := rhel6
+linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@rhel6
+madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2
+iptables-BUILD-FROM-SRPM := yes # tmp
+iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.9-1
+iproute-BUILD-FROM-SRPM := yes
+iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0
###
-ipfw-SVNPATH := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-15
-###
-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
+ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-20
+planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
+
+util-vserver-BUILD-FROM-SRPM := yes # tmp
+util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-11
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-10
-NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
+# 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
+util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-21
+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/trunk
+nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-25
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-15
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-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-17
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/trunk
-drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-GITPATH := git://git.onelab.eu/plewww@PLEWWW-4.3-44
-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-4
-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
+#openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@master
+vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-0
+vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@master
+plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-25
+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-58
+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-10
+#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-1
-ejabberd-SVNPATH := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1
-omf-GITPATH := git://git.onelab.eu/omf@omf-5.3-4
+pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1
+omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-9
###
-sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-13
-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-3
-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-2
-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-5
-MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk
-DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
+#sfa-GITPATH := git://git.onelab.eu/sfa.git@master
+sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-3
+nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-4
+bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-16
+pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
+pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-8
+bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-7
+vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6
+bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-7
+myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-13
+#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@master
+# locating the right test directory - see make tests_svnpath
+tests-GITPATH := git://git.onelab.eu/tests@master
+
+### temporary
+# nozomi not needed anymore for 2.6.27
+ALL:=$(subst nozomi,,$(ALL))
+IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS))