trying to reinstate vsys-scripts on f21/22

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 0a92b71..d8f290c 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -21,7 +21,7 @@ mom-GITPATH                     := git://git.onelab.eu/mom.git@mom-2.3-5
 inotify-tools-GITPATH          := git://git.onelab.eu/inotify-tools.git@inotify-tools-3.13-2
 openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.2-1
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-3
 inotify-tools-GITPATH          := git://git.onelab.eu/inotify-tools.git@inotify-tools-3.13-2
 openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.2-1
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-3

-vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-50
+vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@master

 bind_public-GITPATH             := git://git.onelab.eu/bind_public.git@bind_public-0.1-2
 sliver-openvswitch-GITPATH      := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-2.2.90-1
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@master
 bind_public-GITPATH             := git://git.onelab.eu/bind_public.git@bind_public-0.1-2
 sliver-openvswitch-GITPATH      := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-2.2.90-1
 plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@master

diff --git a/lxc.mk b/lxc.mk
index 04d9b0a..391653b 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -255,13 +255,10 @@ vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 

-# xxx temporarily turning this off on f21
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22)"

 vsys-wrapper-MODULES := vsys-scripts
 vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
 IN_SLICEIMAGE += vsys-wrapper
 ALL += vsys-wrapper
 vsys-wrapper-MODULES := vsys-scripts
 vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
 IN_SLICEIMAGE += vsys-wrapper
 ALL += vsys-wrapper

-endif

 
 #
 # bind_public
 
 #
 # bind_public

diff --git a/onelab-tags.mk b/onelab-tags.mk
index a5fd247..2a0b477 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -25,7 +25,7 @@ pf2slice-GITPATH              := git://git.onelab.eu/pf2slice.git@pf2slice-1.0-2
 mom-GITPATH                     := git://git.onelab.eu/mom.git@mom-2.3-5
 inotify-tools-GITPATH          := git://git.planet-lab.org/inotify-tools.git@inotify-tools-3.13-2
 vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-3
 mom-GITPATH                     := git://git.onelab.eu/mom.git@mom-2.3-5
 inotify-tools-GITPATH          := git://git.planet-lab.org/inotify-tools.git@inotify-tools-3.13-2
 vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-3

-vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-50
+vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@master

 autoconf-GITPATH               := git://git.onelab.eu/autoconf@autoconf-2.69-1
 bind_public-GITPATH             := git://git.onelab.eu/bind_public.git@bind_public-0.1-2
 sliver-openvswitch-GITPATH      := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-2.2.90-1
 autoconf-GITPATH               := git://git.onelab.eu/autoconf@autoconf-2.69-1
 bind_public-GITPATH             := git://git.onelab.eu/bind_public.git@bind_public-0.1-2
 sliver-openvswitch-GITPATH      := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-2.2.90-1