From: Thierry Parmentelat Date: Tue, 12 Mar 2013 11:26:59 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.2.2~64 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=04f55606d33b86ba19fa7203487d959f56d7eafc;hp=3b84e4e470a1de2a54920bd6ecbfca45b33fb298;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/config.lxc/sliceimage.pkgs b/config.lxc/sliceimage.pkgs index a69e4c1d..2c6a506b 100644 --- a/config.lxc/sliceimage.pkgs +++ b/config.lxc/sliceimage.pkgs @@ -35,6 +35,6 @@ package: vsyssh package: bind_public # libvirt lxc containers need this so they can start up their network package: openssh-server dhclient - -package<=f8 package=centos5: vixie-cron -package>=f10: cronie +package: cronie +# preinstall this +package: sliver-openvswitch diff --git a/lxc-tags.mk b/lxc-tags.mk index ea3a0fa5..c9fb3a6e 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -21,6 +21,7 @@ openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git@openvswitch-1.2 vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-3 vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-45 bind_public-GITPATH := git://git.planet-lab.org/bind_public.git@bind_public-0.1-2 +sliver-openvswitch-GITPATH := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-1.9.90-3 plcapi-GITPATH := git://git.planet-lab.org/plcapi.git@plcapi-5.2-1 drupal-GITPATH := git://git.planet-lab.org/drupal.git@drupal-4.7-15 plewww-GITPATH := git://git.planet-lab.org/plewww.git@plewww-5.2-1 diff --git a/lxc.mk b/lxc.mk index 970cc41e..12907ea0 100644 --- a/lxc.mk +++ b/lxc.mk @@ -244,6 +244,11 @@ bind_public-SPEC := bind_public.spec IN_SLICEIMAGE += bind_public ALL += bind_public +sliver-openvswitch-MODULES := sliver-openvswitch +sliver-openvswitch-SPEC := sliver-openvswitch.spec +IN_SLICEIMAGE += sliver-openvswitch +ALL += sliver-openvswitch + # # plcapi #