From 4e735bb7f970012a2b045511a216acd76b0f3df0 Mon Sep 17 00:00:00 2001 From: Chris Riccomini Date: Fri, 26 Sep 2014 15:41:28 -0700 Subject: [PATCH] Rsync files to VM rather than sync folders, since sync folders was causing clock skew and confusig make. --- .gitignore | 1 + java/crossbuild/Vagrantfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 99a7d61d6..e9fdf1368 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ tags java/*.log java/include/org_rocksdb_*.h unity.cc +java/crossbuild/.vagrant diff --git a/java/crossbuild/Vagrantfile b/java/crossbuild/Vagrantfile index 47e76b7da..634271dc3 100644 --- a/java/crossbuild/Vagrantfile +++ b/java/crossbuild/Vagrantfile @@ -9,17 +9,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "linux32" do |linux32| linux32.vm.box = "ubuntu/trusty32" linux32.vm.provision :shell, path: "build-linux.sh" - linux32.vm.synced_folder "../..", "/rocksdb" end config.vm.define "linux64" do |linux64| linux64.vm.box = "ubuntu/trusty64" linux64.vm.provision :shell, path: "build-linux.sh" - linux64.vm.synced_folder "../..", "/rocksdb" end config.vm.provider "virtualbox" do |v| v.memory = 2048 v.cpus = 4 end + + config.vm.synced_folder "../..", "/rocksdb", type: "rsync" end