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

[build.git] / planetlab-k27-tags.mk

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 4360908..edfa83e 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -3,11 +3,14 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-8
+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/trunk
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
+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
+iproute-BUILD-FROM-SRPM := yes # tmp
 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
@@ -33,7 +36,7 @@ drupal-SVNPATH                        := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
 PLEWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-43
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-2
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2
-Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-31
+Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-32
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
@@ -46,11 +49,11 @@ nodeconfig-SVNPATH          := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9
 pyplnet-SVNPATH                        := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5
-BootCD-SVNPATH                 := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1
+BootCD-SVNPATH                 := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-2
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-2
 BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-4
 MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-3
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_svnpath
-tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-4
+tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-5