1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-04 06:21:46 +00:00
Commit graph

303 commits

Author SHA1 Message Date
TW
4c1e2bc4b0
Merge pull request #8565 from ThomasWaldmann/pkgconf
macos: fix broken brew pkg-config -> pkgconf transition
2024-11-24 19:35:03 +01:00
Thomas Waldmann
41f150ff7f
macos: fix broken brew pkg-config upgrade
it looks like in brew they removed pkg-config formula and added
an alias to the pkgconf formula (which also provides a pkg-config
cli command).

the transition was not seamless:

on github actions CI:

Installing pkg-config
==> Downloading https://ghcr.io/v2/homebrew/core/pkgconf/manifests/2.3.0_1
==> Fetching pkgconf
==> Downloading https://ghcr.io/v2/homebrew/core/pkgconf/blobs/sha256:5f83615f295e78e593c767d84f3eddf61bfb0b849a1e6a5ea343506b30b2c620
==> Pouring pkgconf--2.3.0_1.arm64_sonoma.bottle.tar.gz
Error: The `brew link` step did not complete successfully
The formula built, but is not symlinked into /opt/homebrew
Could not symlink bin/pkg-config
Target /opt/homebrew/bin/pkg-config
is a symlink belonging to pkg-config@0.29.2. You can unlink it:
  brew unlink pkg-config@0.29.2

To force the link and overwrite all conflicting files:
  brew link --overwrite pkgconf

To list all files that would be deleted:
  brew link --overwrite pkgconf --dry-run

Possible conflicting files are:
/opt/homebrew/bin/pkg-config -> /opt/homebrew/Cellar/pkg-config@0.29.2/0.29.2_3/bin/pkg-config
/opt/homebrew/share/aclocal/pkg.m4 -> /opt/homebrew/Cellar/pkg-config@0.29.2/0.29.2_3/share/aclocal/pkg.m4
/opt/homebrew/share/man/man1/pkg-config.1 -> /opt/homebrew/Cellar/pkg-config@0.29.2/0.29.2_3/share/man/man1/pkg-config.1
==> Summary
🍺  /opt/homebrew/Cellar/pkgconf/2.3.0_1: 27 files, 474KB
Installing pkg-config has failed!
2024-11-24 18:11:39 +01:00
Björn Ketelaars
cf6a324afa borg2 - Support other OpenSSL versions on OpenBSD
`setup.py` hardcoded crypto library paths for OpenBSD, causing build
issue when OpenBSD drops specific OpenSSL version. Solution is to make
paths configurable.

Addresses #8553.
2024-11-23 23:01:44 +01:00
Björn Ketelaars
9c88e2a4e8 Fix OpenBSD Vagrant
This should address #8506. Unfortunately I'm unable to test.

#8506 is likely caused by the Vagrant box having a mirror in its
`etc/installurl`, which does not offer 7.4 packages. There are other
mirrors out there who do, e.g., https://ftp.eu.openbsd.org/pub/OpenBSD/.

Proposed 'fix' is to replace the mirror in `/etc/installurl`.
2024-11-20 06:01:12 +01:00
Thomas Waldmann
6a1aa438f8
vagrant: add bookworm32 box for 32bit platform testing 2024-11-10 02:11:24 +01:00
Thomas Waldmann
32a8c9a3c9
vagrant: fix pythons on freebsd14
- install with sqlite3
- make sure there is python3/pip3/virtualenv command
2024-11-03 19:28:15 +01:00
Thomas Waldmann
a0f56bfddd
vagrant: simplify openindiana box setup 2024-11-03 15:05:07 +01:00
Thomas Waldmann
1fa2b9a1a0
vagrant: fix macos1012 box, try 5 2024-10-29 18:12:17 +01:00
Thomas Waldmann
af8d2583a5
vagrant: fix macos1012 box, try 4 2024-10-29 14:44:37 +01:00
Thomas Waldmann
66f06f156d
vagrant: fix macos1012 box, try 3 2024-10-28 23:16:50 +01:00
Thomas Waldmann
3fb543dd2b
vagrant: fix macos1012 box, try 2 2024-10-28 21:35:33 +01:00
Thomas Waldmann
3a7881f8dd
vagrant: fix macos1012 box (curl, ca-certificates, openssl@3) 2024-10-28 21:10:28 +01:00
Thomas Waldmann
2ca8ef33e1
vagrant: pyenv: only install python 3.12
on macOS, installing older Pythons seems to uninstall OpenSSL 3 and only 1.1 is left.

also, building all these pythons and misc. openssl versions takes forever and we
only need 3.12 for the binary build. testing on misc. python versions is regularly
done one github actions CI.
2024-10-28 10:41:30 +01:00
Thomas Waldmann
43ec9fc7f3
avoid broken pip 24.2
- it is broken on old macOS
- python 3.12.5/6/7 has bundled pip 24.2
2024-10-27 13:04:51 +01:00
Thomas Waldmann
e5fe1ddd00
vagrant: use Python 3.11.3
3.11.2 had a compile failure on macos1012.
2024-10-02 17:38:00 +02:00
Thomas Waldmann
0aed3cc2cb
vagrant: macos: give more memory
sometimes the VM just got stuck (usually when building/testing openssl 3),
maybe more RAM helps?
2024-10-02 17:37:59 +02:00
Thomas Waldmann
f7d0cbeeed
vagrant: use bento/ubuntu-24.04 for now 2024-10-02 17:37:54 +02:00
Thomas Waldmann
7a0540db7b
vagrant: install rust on *BSD 2024-09-30 17:37:49 +02:00
Thomas Waldmann
c3a63bd2b2
use python 3.12.6 for binary builds 2024-09-30 17:33:06 +02:00
Thomas Waldmann
ae85f64536
upgrade pyinstaller to 6.10.0 2024-09-25 23:21:32 +02:00
Thomas Waldmann
a6fdb4dec0
vagrant: netbsd/openbsd: add version number 2024-07-19 14:16:22 +02:00
Thomas Waldmann
296c674fdf
vagrant: macos: add version number to call param 2024-07-19 14:16:07 +02:00
Thomas Waldmann
f4367d66d8
vagrant: darwin -> macos
Also: add macOS version number.
2024-07-19 14:15:15 +02:00
Thomas Waldmann
0b660e0e75
vagrant: get rid of the "64" suffix for VM names.
We only have 64bit machines anyway. And even in the unlikely
case we would add 32bit machines, we could suffix them by "32".
2024-07-19 14:14:22 +02:00
Thomas Waldmann
273aaaf572
vagrant: use freebsd(13|14)_64 as VM name 2024-07-19 14:13:13 +02:00
Thomas Waldmann
3f5cb32328
add freebsd 13 box, fixes #8266
users of TrueNAS do not have fbsd 14 yet.
2024-07-19 14:11:57 +02:00
Thomas Waldmann
4c76b67873
vagrant: use Python 3.11.9 2024-07-18 23:49:59 +02:00
Thomas Waldmann
70d1758e04
vagrant: use pyinstaller 6.7.0 2024-07-18 23:48:19 +02:00
Thomas Waldmann
f28084d773
vagrant: ubuntu lunar -> noble VM
Noble should become stable / LTS soon.
2024-04-01 20:36:06 +02:00
Thomas Waldmann
b25caafc94
vagrant: remove buster VM
It's already outdated now and its libxxhash
does not support pkg-config discovery.
2024-04-01 20:32:24 +02:00
Thomas Waldmann
ffc1e3ef6f
vagrant: use pyinstaller 6.5.0 2024-04-01 20:28:56 +02:00
Thomas Waldmann
7ac7c79563
use python 3.11.8 for binary builds 2024-04-01 20:26:17 +02:00
Thomas Waldmann
4ff0ba48f8
vagrant: openindiana updates 2024-04-01 20:22:30 +02:00
Thomas Waldmann
8eba627b29
scripts: make.py clean implementation 2024-02-09 17:37:46 +01:00
Thomas Waldmann
a9ea8aa67d
vagrant: use openssl 3.0 on macOS 2024-01-10 22:29:11 +01:00
Thomas Waldmann
eec78802bf
vagrant: remove outdated comment 2024-01-10 22:26:31 +01:00
Thomas Waldmann
86d6fcfe0a
vagrant: use generic/openbsd7 box 2024-01-10 22:25:36 +01:00
Thomas Waldmann
5480906c06
vagrant: netbsd: test on py311 only
the netbsd vagrant machine tends to segfault, guess due to some kernel or virtualbox issue.

 thus, rather only do 1 tox run, so there is less output to review.
2024-01-10 22:24:47 +01:00
Thomas Waldmann
f5a6d61e56
vagrant: use python 3.9.4 for tests
same as in 1.4-maint branch
2024-01-10 22:21:49 +01:00
Thomas Waldmann
140e079496
vagrant: remove debian 9 "stretch" box
there are multiple issues with that box:
- debian 9 is out of support by debian, out of even lts support since 2022
- it has a OpenSSL 1.x natively (and our source based install also used 1.x) - that is also out of support and noone will care for it.

Also, borg2 will still take a while, so it would be
even more outdated at release time as it already
is now.
2024-01-10 22:19:57 +01:00
Thomas Waldmann
c96fe77d2e
vagrant: use freebsd 14, fixes #6871 2024-01-10 22:14:09 +01:00
Thomas Waldmann
a6f224f031
vagrant: use the latest python 3.11.7 for binary builds 2024-01-10 22:10:54 +01:00
Thomas Waldmann
723994a2f1
use pyinstaller 6.3.0 2024-01-02 20:33:34 +01:00
Thomas Waldmann
1a544845a2
use less setup.py, use pip and build
todo: clean clean2 build_usage build_man
2024-01-02 19:50:59 +01:00
Thomas Waldmann
f7e8462bd0
vagrant: use generic/debian9 box, fixes #7579
the debian/stretch64 was broken and never fixed.
2023-10-10 17:41:58 +02:00
Thomas Waldmann
fc0dbe2913
vagrant: install py312 via pyenv 2023-10-10 17:37:34 +02:00
Thomas Waldmann
a7067ebbaa
vagrant: upgrade source dependencies of stretch VM 2023-09-14 22:41:44 +02:00
Thomas Waldmann
75f8391bb6
vagrant: upgrade to pyinstaller 5.13.2 2023-09-14 19:26:01 +02:00
Thomas Waldmann
b2e8ad0257
vagrant: upgrade to python 3.11.5 2023-09-14 17:01:54 +02:00
Björn Ketelaars
83d4fca4d2 OpenBSD only: switch to OpenSSL-3.0 2023-09-11 21:43:35 +02:00