###
linux-2.6-BRANCH := rhel6
-linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-22
+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
###
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@sface-0.1-16