From: Thierry Parmentelat <thierry.parmentelat@inria.fr> Date: Fri, 19 Jun 2015 15:52:02 +0000 (+0200) Subject: trying to reinstate vsys-scripts on f21/22 X-Git-Tag: 5.3.9~22 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f5b06fd70d6310829becb90128ca3054e2a50637;p=build.git trying to reinstate vsys-scripts on f21/22 --- diff --git a/lxc-tags.mk b/lxc-tags.mk index 0a92b71c..d8f290ce 100644 --- 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 -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 diff --git a/lxc.mk b/lxc.mk index 04d9b0aa..391653be 100644 --- 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 -# 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 -endif # # bind_public diff --git a/onelab-tags.mk b/onelab-tags.mk index a5fd247d..2a0b4776 100644 --- 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 -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