mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 10:18:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5134 from ThomasWaldmann/vagrant-fixes

Browse source 
Vagrant fixes (master)
This commit is contained in:
TW 2020-04-18 23:09:39 +02:00 committed by GitHub
commit fb06160fd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Vagrantfile vendored
View file

@ -20,7 +20,7 @@ def packages_debianoid(user)
chgrp fuse /dev/fuse chgrp fuse /dev/fuse
chmod 666 /dev/fuse chmod 666 /dev/fuse
apt install -y fakeroot build-essential git curl apt install -y fakeroot build-essential git curl
apt install -y python3-dev python3-setuptools python-virtualenv python3-virtualenv apt install -y python3-dev python3-setuptools virtualenv
# for building python: # for building python:
apt install -y zlib1g-dev libbz2-dev libncurses5-dev libreadline-dev liblzma-dev libsqlite3-dev libffi-dev apt install -y zlib1g-dev libbz2-dev libncurses5-dev libreadline-dev liblzma-dev libsqlite3-dev libffi-dev
EOF EOF
@ -46,11 +46,9 @@ def packages_freebsd
pkg install -y liblz4 zstd fusefs-libs pkgconf pkg install -y liblz4 zstd fusefs-libs pkgconf
pkg install -y git bash # fakeroot causes lots of troubles on freebsd pkg install -y git bash # fakeroot causes lots of troubles on freebsd
# for building python: # for building python:
pkg install -y sqlite3 pkg install -y python37 py37-sqlite3 py37-virtualenv py37-pip
pkg install -y py27-virtualenv # provides "virtualenv" command
pkg install -y python36 py36-virtualenv py36-pip
# make sure there is a python3 command # make sure there is a python3 command
ln -s /usr/local/bin/python3.6 /usr/local/bin/python3 ln -sf /usr/local/bin/python3.7 /usr/local/bin/python3
# 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

2
scripts/borg.exe.spec
View file

@ -13,7 +13,7 @@ if is_win32:
hiddenimports = [] hiddenimports = []
else: else:
basepath = '/vagrant/borg/borg' basepath = '/vagrant/borg/borg'
hiddenimports = ['borg.platform.posix'] hiddenimports = ['borg.platform.posix', 'pkg_resources.py2_warn', ]
block_cipher = None block_cipher = None