move the conditional definitions of *-BUILD-FROM-RPMS in the tags files

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 6875c32..e46b041 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -6,6 +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/tags/iptables-1.4.7-2
 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/tags/iptables-1.4.7-2

+iptables-BUILD-FROM-SRPM := yes        # tmp

 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 ###
 ipfw-SVNPATH                   := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-12
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 ###
 ipfw-SVNPATH                   := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-12

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index b9e94c0..edfa83e 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -6,8 +6,11 @@
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.7-2
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.7-2

+iptables-BUILD-FROM-SRPM := yes        # tmp

 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.33-2
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.33-2

+iproute-BUILD-FROM-SRPM := yes # tmp

 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/trunk
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/trunk

+util-vserver-BUILD-FROM-SRPM := yes    # tmp

 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
 # 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
 # Trellis is using a modified util-vserver-pl with the 2.6.27 kernel
 # initial tag would be tags/util-vserver-pl-0.4-3

diff --git a/planetlab.mk b/planetlab.mk
index 9511281..77333b0 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -56,9 +56,6 @@ 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


@@ -172,9 +169,6 @@ IN_BOOTSTRAPFS += mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec

-ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk"
-iptables-BUILD-FROM-SRPM := yes
-endif

 iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
 iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables


@@ -184,9 +178,6 @@ IN_BOOTSTRAPFS += iptables
 #
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 #
 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
 ALL += iproute
 IN_BOOTSTRAPFS += iproute
 IN_VSERVER += iproute