switch to trunk version of iproute2

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index b639103..9897155 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -6,7 +6,7 @@
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-8
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
+iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/trunk
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/trunk
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 # Trellis is using a modified util-vserver-pl with the 2.6.27 kernel

diff --git a/planetlab.mk b/planetlab.mk
index 9e50cc9..9511281 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -184,6 +184,9 @@ IN_BOOTSTRAPFS += iptables
 #
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
+ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk"
+iproute-BUILD-FROM-SRPM := yes
+endif
 ALL += iproute
 IN_BOOTSTRAPFS += iproute
 IN_VSERVER += iproute