Merge branch 'update-vagrantfile' into 'master'

Update Vagrantfile and docs to clarify v1.4.3 is ok

Saw in the server docs that we were recommending 1.3.x and saying 1.4.x was broken. I've confirmed that 1.4.x works, and updated things accordingly. Higher version might work, but figured minimal change to build stuff was best :)

See merge request !24

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 8dd4078d61a174d4368df61d2e46db9ecc830ef3..c57689c7e0903f62f485347dd34b40aa8857895f 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -113,8 +113,7 @@ VirtualBox (debian package virtualbox)
 @item
 Ruby (debian packages ruby and rubygems)
 @item
-Vagrant (unpackaged) Be sure to use 1.3.x because 1.4.x is completely broken
-(at the time of writing, the forthcoming 1.4.3 might work)
+Vagrant (unpackaged, tested on v1.4.3)
 @item
 Paramiko (debian package python-paramiko)
 @item

diff --git a/makebuildserver b/makebuildserver
index 379001c80bd2b680744581c7f3f974e8182dd3d6..2f67f345942f2fff538bce55d558dc5c73ba2d0d 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -147,12 +147,14 @@ for f, src, shasum in cachefiles:
 # Generate an appropriate Vagrantfile for the buildserver, based on our
 # settings...
 vagrantfile = """
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
 
   config.vm.box = "{0}"
   config.vm.box_url = "{1}"
 
-  config.vm.customize ["modifyvm", :id, "--memory", "{2}"]
+  config.vm.provider "virtualbox" do |v|
+    v.customize ["modifyvm", :id, "--memory", "{2}"]
+  end
 
   config.vm.provision :shell, :path => "fixpaths.sh"
 """.format(config['basebox'], config['baseboxurl'], config['memory'])