commit 9714a8d618a8ec12269f13acf23c7722f8da15d6 Author: Georg Koppen <georg@getfoxyproxy.org> Date: Fri Aug 2 11:47:24 2013 +0200 Added necessary minVersion for Vagrant (1.1.0) and fixed Vagrant's make file to not only run the hostvm target --- vagrant/Makefile | 8 ++++---- vagrant/README.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vagrant/Makefile b/vagrant/Makefile index d4cfc38..36738f2 100644 --- a/vagrant/Makefile +++ b/vagrant/Makefile @@ -4,7 +4,10 @@ REQS = git apache2 python-vm-builder ruby debootstrap lxc apt-cacher-ng \ # remove torsocks to speed up testing TORSOCKS = torsocks -.PHONY: hostvm +.PHONY: all hostvm tbb + +all: hostvm tbb + hostvm: vagrant destroy --force vagrant up @@ -19,7 +22,6 @@ hostvm: vagrant ssh --command "sudo $(TORSOCKS) apt-get install -y $(REQS)" vagrant halt -.PHONY: tbb tbb: vagrant up vagrant ssh --command "\ @@ -46,5 +48,3 @@ tbb: cp -R 3.* /vagrant/" vagrant halt - -all: hostvm tbb \ No newline at end of file diff --git a/vagrant/README.md b/vagrant/README.md index 6873a42..e344254 100644 --- a/vagrant/README.md +++ b/vagrant/README.md @@ -4,9 +4,9 @@ Automated Gitian builds with Vagrant Install VirtualBox and Vagrant, https://www.virtualbox.org/wiki/Downloads - http://vagrantup.com/ + http://vagrantup.com/ (version 1.1.0 or higher required) Then, cd vagrant/ - make \ No newline at end of file + make