Skip to content

Commit 0de1b52

Browse files
authored
Try installing packages from https using the real major version
1 parent ccba989 commit 0de1b52

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

build.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,11 @@ packages()
212212
# Install packages beginning with 'https:'
213213
mkdir -p ${uzip}${pkg_cachedir}/furybsd-https
214214
for url in $(grep -e '^https' "${cwd}/settings/packages.$p"); do
215+
# First, try installing this using the real major version
216+
pkg_add_from_url "$url" furybsd-https "freebsd:$MAJOR:$arch" || true
217+
# Second, try installing this using
215218
# ABI=freebsd:12:$arch in an attempt to use package built on 12 for 13
216-
pkg_add_from_url "$url" furybsd-https "freebsd:12:$arch"
219+
pkg_add_from_url "$url" furybsd-https "freebsd:12:$arch" || true
217220
done
218221
done
219222
# Install the packages we have generated in pkg() that are listed in transient-packages-list

0 commit comments

Comments
 (0)