From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Wed, 7 Apr 2010 20:58:12 +0000 (+0000)
Subject: use trunk@util-vserver for k27 builds
X-Git-Tag: 5.0-rc2~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0b806c78074ee8753d84f07be19cd5159566cb9a;p=build.git

use trunk@util-vserver for k27 builds
---

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 474c2ba9..cebbebdc 100644
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -11,8 +11,7 @@ madwifi-SVNPATH                 := http://svn.planet-lab.org/svn/madwifi/tags/ma
 # Trellis is using a modified util-vserver and util-vserver-pl with the 2.6.27 kernel
 # this branch is numbered 0.30.216-pre2833 in the specfile
 # initial tag would be util-vserver-0.30.216-pre2833-0
-util-vserver-SVNBRANCH		:= trellis
-util-vserver-SVNPATH		:= http://svn.planet-lab.org/svn/util-vserver/branches/trellis
+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
 # this branch is numbered 0.4 in the specfile
 # initial tag would be tags/util-vserver-pl-0.4-3
diff --git a/planetlab.mk b/planetlab.mk
index 2380dcc5..a7b08d0e 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -56,6 +56,9 @@ IN_BOOTSTRAPFS += madwifi
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
+ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk"
+util-vserver-BUILD-FROM-SRPM := yes
+endif
 util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver