use trunk@util-vserver for k27 builds

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 474c2ba..cebbebd 100644 (file)
--- 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
 # 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
 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 2380dcc..a7b08d0 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -56,6 +56,9 @@ IN_BOOTSTRAPFS += madwifi
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
 #
 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
 util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver