From 103aad3ed093ace885ba1a682e292d85c7bc48f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 15 Apr 2010 20:46:30 +0000 Subject: [PATCH] switch to trunk version of iproute2 --- planetlab-k27-tags.mk | 2 +- planetlab.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index b639103b..9897155a 100644 --- 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 9e50cc96..95112810 100644 --- 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 -- 2.47.0