From 0de1b525f7e03d9eec117d19adb73edd1ed98a0f Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 10 Jul 2022 12:56:51 +0200 Subject: [PATCH] Try installing packages from https using the real major version --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 713d6d30..553b7c3b 100755 --- a/build.sh +++ b/build.sh @@ -212,8 +212,11 @@ packages() # Install packages beginning with 'https:' mkdir -p ${uzip}${pkg_cachedir}/furybsd-https for url in $(grep -e '^https' "${cwd}/settings/packages.$p"); do + # First, try installing this using the real major version + pkg_add_from_url "$url" furybsd-https "freebsd:$MAJOR:$arch" || true + # Second, try installing this using # ABI=freebsd:12:$arch in an attempt to use package built on 12 for 13 - pkg_add_from_url "$url" furybsd-https "freebsd:12:$arch" + pkg_add_from_url "$url" furybsd-https "freebsd:12:$arch" || true done done # Install the packages we have generated in pkg() that are listed in transient-packages-list