###
linux-2.6-BRANCH := rhel6
-linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@rhel6
+linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-24
# help out spec2make on f8 and centos5, due to a bug in rpm
# ditto on f15 for spec2make.py - tmp hopefully
ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f15 centos5)"
kernel-DEVEL-RPMS += elfutils-libelf-devel
madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2
-iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-4
-iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.37-2
+iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
+# we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel
+# note that this should be consistently reflected in pl_getKexcludes in build.common
+ALL := $(filter-out iproute,$(ALL))
###
ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-21
###
comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3
planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
-util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@master
+util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-17
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
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-32
+nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-33
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-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
+fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3
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-4
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-1
-vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-29
-plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-33
+vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-30
+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@plewww-4.3-65
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1
ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2
omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-10
-oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.5.1-1
+oml-GITPATH := git://git.onelab.eu/oml.git@master
###
sfa-GITPATH := git://git.onelab.eu/sfa.git@master
-sface-GITPATH := git://git.onelab.eu/sface.git@master
+sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-16
nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20
pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10