From b2c3099fb9ac09685c706d7de01f7aea5efc33c6 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 22 Jan 2022 17:25:54 +0100 Subject: [PATCH 1/5] vagrant: fix vagrant scp on macOS, fixes #5921 it did not find pyenv in PATH, resulting in unpretty error messages. --- Vagrantfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 083f58f68..32d866b08 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -207,6 +207,8 @@ def install_pyenv(boxname) . ~/.bash_profile curl -s -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash echo 'eval "$(pyenv init --path)"' >> ~/.bash_profile + echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc + echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc echo 'eval "$(pyenv init -)"' >> ~/.bashrc echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc EOF From 8e6aeebd6021a0a5eeee5fcb7419b92a286f7cba Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 22 Jan 2022 17:41:50 +0100 Subject: [PATCH 2/5] vagrant: use macfuse instead of osxfuse note: we also use the more recent macfuse on github CI. --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 32d866b08..ee85b4d5b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -58,7 +58,7 @@ def packages_darwin which brew || CI=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" brew update > /dev/null brew install pkg-config readline openssl@1.1 zstd lz4 xz fakeroot git - brew install --cask osxfuse + brew install --cask macfuse brew upgrade # upgrade everything echo 'export PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig' >> ~vagrant/.bash_profile EOF From 45fd1437860b03ed92797ee3cf24be26b2bcad46 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 22 Jan 2022 17:45:28 +0100 Subject: [PATCH 3/5] vagrant: also invoke setup.py clean2 clean2 was added to work around some setuptools customizability limitation. --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index ee85b4d5b..b4fd1834d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -261,6 +261,7 @@ def install_borg(fuse) cd borg pip install -r requirements.d/development.lock.txt python setup.py clean + python setup.py clean2 EOF if fuse script += <<-EOF From c115581098d346340a22ff9a6acbabd1f06b09f7 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 22 Jan 2022 17:48:57 +0100 Subject: [PATCH 4/5] vagrant: more memory for darwin64 maybe this speeds up the VM a bit. --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index b4fd1834d..50e72fb77 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -421,7 +421,7 @@ Vagrant.configure(2) do |config| config.vm.define "darwin64" do |b| b.vm.box = "macos-sierra" b.vm.provider :virtualbox do |v| - v.memory = 2048 + $wmem + v.memory = 4096 + $wmem v.customize ['modifyvm', :id, '--ostype', 'MacOS_64'] v.customize ['modifyvm', :id, '--paravirtprovider', 'default'] v.customize ['modifyvm', :id, '--nested-hw-virt', 'on'] From d0fd7d08243f2c91bdf51b6917c8992ed9f510e4 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 22 Jan 2022 17:50:23 +0100 Subject: [PATCH 5/5] vagrant: adapt memory for openindiana64 use same amount as in master branch. --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 50e72fb77..75543ca94 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -492,7 +492,7 @@ Vagrant.configure(2) do |config| config.vm.define "openindiana64" do |b| b.vm.box = "openindiana" b.vm.provider :virtualbox do |v| - v.memory = 3072 + $wmem + v.memory = 2048 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages openindiana", :type => :shell, :inline => packages_openindiana