From: Andy Zhou Date: Thu, 8 Jan 2015 03:42:41 +0000 (-0800) Subject: vagrant: switch to use out of tree build X-Git-Tag: v2.12.3~7514 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b56b2566417dd436e768394c12b030019d2dc101;p=mirror_ovs.git vagrant: switch to use out of tree build Vagrant shared folder, at least on the default virtual box, does not support the creation of the socket files. If one were to build OVS under /vagrant, 'make check' would not work. Out of tree builds can be used to work around this issue. See Install.md for instructions. Since out of tree builds requires a clean source tree, Vagrantfile can not be a generated file. This commit removes Vagrantfile.in, commit Vagrantfile instead. Signed-off-by: Andy Zhou Acked-by: Thomas Graf --- diff --git a/.gitignore b/.gitignore index a3522d8e6..e37a6903c 100644 --- a/.gitignore +++ b/.gitignore @@ -65,5 +65,4 @@ tags _debian odp-netlink.h OvsDpInterface.h -Vagrantfile /.vagrant/ diff --git a/INSTALL.md b/INSTALL.md index 8fae214a7..94c25f718 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -579,7 +579,7 @@ report, plus any other information needed to reproduce the problem. Vagrant ------- -Requires: Vagrant and a compatible hypervisor +Requires: Vagrant (version 1.7.0 or later) and a compatible hypervisor You must bootstrap and configure the sources (steps are in "Building and Installing Open vSwitch for Linux, FreeBSD or NetBSD" above) before @@ -592,12 +592,25 @@ tree as found locally in a virtual machine using the following commands: vagrant ssh This will bring up w Fedora 20 VM by default, alternatively the -`Vagrantfile.in` can be modified to use a different distribution box as -base. Also, the VM can be reprovisioned at any time to recompile and -reinstall OVS: +`Vagrantfile` can be modified to use a different distribution box as +base. Also, the VM can be reprovisioned at any time: vagrant provision +OVS out-of-tree compilation environment can be set up with: + + ./boot.sh + vagrant provision --provision-with configure_ovs,build_ovs + +This will set up an out-of-tree build environment in /home/vagrant/build. +The source code can be found in /vagrant. Out-of-tree build is preferred +to work around limitations of the sync file systems. + +To recompile and reinstall OVS using RPM: + + ./boot.sh + vagrant provision --provision-with configure_ovs,install_rpm + Continuous Integration with Travis-CI ------------------------------------- diff --git a/Makefile.am b/Makefile.am index 6ad6fc2fe..b3ff4e31d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,7 +105,7 @@ EXTRA_DIST = \ build-aux/soexpand.pl \ $(MAN_FRAGMENTS) \ $(MAN_ROOTS) \ - Vagrantfile.in + Vagrantfile bin_PROGRAMS = sbin_PROGRAMS = bin_SCRIPTS = diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 000000000..982eb0113 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,49 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +$bootstrap_fedora = <