Renamed vsys-factory to vsys-scripts so that it can be deployed on 4.2.

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 2a3c41c..15d7d13 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -31,8 +31,8 @@ iptables-SVNPATH              := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 vsys-SVNBRANCH                 := 0.7
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.7-26
-vsys-factory-SVNBRANCH := 0.7
-vsys-factory-SVNPATH   := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-factory-0.7-0
+vsys-scripts-SVNBRANCH := 0.9
+vsys-scripts-SVNPATH   := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.9-0
 dummynet_image-SVNPATH         := http://svn.planet-lab.org/svn/dummynet_image/tags/dummynet_image-1.0-4
 PLCAPI-SVNBRANCH               := dummynet
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-dummynet-15

diff --git a/onelab.mk b/onelab.mk
index 1402df5..adf5213 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -224,10 +224,10 @@ ALL += vsys
 endif
 
 ifeq "$(vsys_support)" "yes"
-vsys-factory-MODULES := vsys-factory
-vsys-factory-SPEC := vsys-factory.spec
-IN_BOOTSTRAPFS += vsys-factory
-ALL += vsys-factory
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
 endif
 
 

diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk
index 4ad2859..63cd839 100644 (file)
--- a/planetlab-tags-4.2.mk
+++ b/planetlab-tags-4.2.mk
@@ -29,8 +29,8 @@ iptables-SVNPATH              := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 vsys-SVNBRANCH                 := 0.7
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.7-26
-vsys-factory-SVNBRANCH := 0.7
-vsys-factory-SVNPATH   := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-factory-0.7-0
+vsys-scripts-SVNBRANCH := 0.9
+vsys-scripts-SVNPATH   := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.9-0
 PLCAPI-SVNBRANCH               := 4.2
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.2-18
 PLCWWW-SVNBRANCH               := 4.2

diff --git a/planetlab.mk b/planetlab.mk
index 36ef344..7592ba8 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -211,14 +211,14 @@ ALL += vsys
 endif
 
 #
-# vsys-factory
+# vsys-scripts
 #
 
 ifeq "$(vsys_support)" "yes"
-vsys-factory-MODULES := vsys-factory
-vsys-factory-SPEC := vsys-factory.spec
-IN_BOOTSTRAPFS += vsys-factory
-ALL += vsys-factory
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
 endif