X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=onelab-k32-tags.mk;h=0536ae4993cfb3d195b9df8b11d13cee2b0f3383;hb=89f49bc2002a3269f967d9d65dcabee22302a49d;hp=d192a1097fb65baa5cf2db2a6079f2dc8f8967ba;hpb=f4c84b8465778e6c1fa2765704b67b6ba0d43713;p=build.git

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index d192a109..0536ae49 100644
--- 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
 ###
@@ -47,7 +47,7 @@ pyopenssl-SVNPATH		:= http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 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