upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-24 07:41:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5705 from m3nu/issue/5660/macfuse-m1

Browse source 
Apple M1 compatibility
This commit is contained in:
TW 2021-02-22 17:23:25 +01:00 committed by GitHub
commit 6daa62f450
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/installation.rst
View file

@ -50,7 +50,7 @@ Fedora/RHEL `Fedora official repository`_ ``dnf install borgbac
FreeBSD `FreeBSD ports`_ ``cd /usr/ports/archivers/py-borgbackup && make install clean``
macOS `Homebrew`_ | ``brew install borgbackup`` (official formula, **no** FUSE support)
| **or**
| ``brew install --cask osxfuse`` (`private Tap`_, FUSE support)
| ``brew install --cask macfuse`` (`private Tap`_, FUSE support)
| ``brew install borgbackup/tap/borgbackup-fuse``
Mageia `cauldron`_ ``urpmi borgbackup``
NetBSD `pkgsrc`_ ``pkg_add py-borgbackup``
@ -243,7 +243,7 @@ For FUSE support to mount the backup archives, you need at least version 3.0 of
macFUSE, which is available via `Github
<https://github.com/osxfuse/osxfuse/releases/latest>`__, or Homebrew::
brew install --cask osxfuse
brew install --cask macfuse
For OS X Catalina and later, be aware that you must authorize full disk access.
It is no longer sufficient to run borg backups as root. If you have not yet

2
setup.py
View file

@ -168,7 +168,7 @@ library_dirs = []
define_macros = []
possible_openssl_prefixes = ['/usr', '/usr/local', '/usr/local/opt/openssl', '/usr/local/ssl', '/usr/local/openssl',
'/usr/local/borg', '/opt/local', '/opt/pkg', ]
'/usr/local/borg', '/opt/local', '/opt/pkg', '/opt/homebrew/opt/openssl@1.1', ]
if os.environ.get('BORG_OPENSSL_PREFIX'):
possible_openssl_prefixes.insert(0, os.environ.get('BORG_OPENSSL_PREFIX'))
ssl_prefix = detect_openssl(possible_openssl_prefixes)