mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #578 from ThomasWaldmann/update-vagrantfile 

Vagrantfile: use pyinstaller 3.1, freebsd sqlite3 fix, fixes #569
This commit is contained in:
TW 2016-01-18 18:27:26 +01:00
parent 3b6fdbc57c efec1a396e
commit 59540aa7de
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Vagrantfile vendored
View File

@ -76,7 +76,7 @@ def packages_freebsd
pkg install -y openssl liblz4 fusefs-libs pkgconf pkg install -y openssl liblz4 fusefs-libs pkgconf
pkg install -y fakeroot git bash pkg install -y fakeroot git bash
# for building python: # for building python:
pkg install sqlite3 pkg install -y sqlite3
# make bash default / work: # make bash default / work:
chsh -s bash vagrant chsh -s bash vagrant
mount -t fdescfs fdesc /dev/fd mount -t fdescfs fdesc /dev/fd
@ -211,8 +211,7 @@ def install_pyinstaller(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
# use develop branch for now, see borgbackup issue #336 git checkout v3.1
git checkout develop
pip install -e . pip install -e .
EOF EOF
end end
@ -224,8 +223,7 @@ 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
# use develop branch for now, see borgbackup issue #336 git checkout v3.1
git checkout develop
# build bootloader, if it is not included # build bootloader, if it is not included
cd bootloader cd bootloader
python ./waf all python ./waf all