mirror of
https://github.com/borgbackup/borg.git
synced 2024-12-25 01:06:50 +00:00
use patched LDLP-preserving pyinstaller, fixes #1416
see https://github.com/pyinstaller/pyinstaller/pull/2148 also: use waf --no-lsb (the bootloader does not build without it on our wheezy32 vagrant VM)
This commit is contained in:
parent
45fd66f6e1
commit
821fba8cb0
1 changed files with 9 additions and 4 deletions
13
Vagrantfile
vendored
13
Vagrantfile
vendored
|
@ -248,10 +248,13 @@ def install_pyinstaller_bootloader(boxname)
|
||||||
. borg-env/bin/activate
|
. borg-env/bin/activate
|
||||||
git clone https://github.com/pyinstaller/pyinstaller.git
|
git clone https://github.com/pyinstaller/pyinstaller.git
|
||||||
cd pyinstaller
|
cd pyinstaller
|
||||||
git checkout v3.1.1
|
# develop branch, merge commit of ThomasWaldmann/do-not-overwrite-LD_LP
|
||||||
|
git checkout 639fcec992d753db2058314b843bccc37b815265
|
||||||
# build bootloader, if it is not included
|
# build bootloader, if it is not included
|
||||||
cd bootloader
|
cd bootloader
|
||||||
python ./waf all
|
# XXX temporarily use --no-lsb as we have no LSB environment
|
||||||
|
# XXX https://github.com/borgbackup/borg/issues/1506
|
||||||
|
python ./waf --no-lsb all
|
||||||
cd ..
|
cd ..
|
||||||
pip install -e .
|
pip install -e .
|
||||||
EOF
|
EOF
|
||||||
|
@ -392,7 +395,8 @@ Vagrant.configure(2) do |config|
|
||||||
b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("wheezy32")
|
b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("wheezy32")
|
||||||
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("wheezy32")
|
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("wheezy32")
|
||||||
b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("wheezy32")
|
b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("wheezy32")
|
||||||
b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller("wheezy32")
|
# XXX https://github.com/borgbackup/borg/issues/1506
|
||||||
|
b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller_bootloader("wheezy32")
|
||||||
b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("wheezy32")
|
b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("wheezy32")
|
||||||
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("wheezy32")
|
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("wheezy32")
|
||||||
end
|
end
|
||||||
|
@ -405,7 +409,8 @@ Vagrant.configure(2) do |config|
|
||||||
b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("wheezy64")
|
b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("wheezy64")
|
||||||
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("wheezy64")
|
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("wheezy64")
|
||||||
b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("wheezy64")
|
b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("wheezy64")
|
||||||
b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller("wheezy64")
|
# XXX https://github.com/borgbackup/borg/issues/1506
|
||||||
|
b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller_bootloader("wheezy64")
|
||||||
b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("wheezy64")
|
b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("wheezy64")
|
||||||
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("wheezy64")
|
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("wheezy64")
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue