stop building our iproute in planetlab/k32 as well

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index d192a10..bfe9e7f 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -12,9 +12,9 @@ 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-5
-# we use the stock iproute2 with 2.6.32, since our gre patch is not needed
-#iproute2-GITPATH                := git://git.onelab.eu/iproute2.git@iproute2-2.6.37-2
-ALL := $(subst iproute,,$(ALL))
+# 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
 ###

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 3e95343..3b9af76 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -10,7 +10,9 @@ endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-5
-iproute2-GITPATH                := git://git.planet-lab.org/iproute2.git@iproute2-2.6.37-2
+# 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))
 util-vserver-GITPATH           := git://git.planet-lab.org/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.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26