diff --git a/kbuildx/scripts/netbsd-deps.sh b/kbuildx/scripts/netbsd-deps.sh index d18fe81..e4ab762 100755 --- a/kbuildx/scripts/netbsd-deps.sh +++ b/kbuildx/scripts/netbsd-deps.sh @@ -1,7 +1,6 @@ #!/bin/sh set -eu -version=$1 export PATH=/usr/pkg/bin:/usr/pkg/sbin:/sbin:/usr/sbin:/bin:/usr/bin if command -v resize_ffs >/dev/null 2>&1; then printf '%s\n' 'Growing NetBSD FFS root filesystem to fill the virtual disk' @@ -12,17 +11,8 @@ else printf '%s\n' 'NetBSD resize_ffs is unavailable; cannot use the expanded build disk' >&2 exit 1 fi -case "$(uname -m)" in - amd64|x86_64) pkg_arch=x86_64 ;; - *) pkg_arch=aarch64 ;; -esac -host_release=$(uname -r) -case "$host_release" in - 11.99.*) pkg_release=11.0 ;; - 10.*) pkg_release=${host_release%%-*} ;; - *) pkg_release=${host_release%%-*} ;; -esac -package_path="http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$pkg_arch/$pkg_release/All/" +pkg_arch=x86_64 +package_path="http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$pkg_arch/11.0/All/" # The prepared bsdkrun NetBSD image has no CA bundle and cannot install one # into its read-only certificate layout; use the official CDN over HTTP for # this disposable CI build guest so pkg_add/pkgin can bootstrap successfully. @@ -39,13 +29,6 @@ mkdir -p /usr/pkg/man/man1 /usr/pkg/man/man3 /usr/pkg/man/man5 /usr/pkg/man/man7 export PKG_PATH="$package_path" printf '%s\n' "$package_path" > /usr/pkg/etc/pkgin/repositories.conf pkgin -y update -secure_path="https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$pkg_arch/$pkg_release/All/" -if [ -e /etc/ssl/cert.pem ] || [ -e /etc/openssl/certs/ca-certificates.crt ]; then - package_path="$secure_path" - export PKG_PATH="$package_path" - printf '%s\n' "$package_path" > /usr/pkg/etc/pkgin/repositories.conf - pkgin -y update -fi # Install xmlcatmgr separately: its post-install step may replace the man # directory after our initial layout setup. Recreate it before git-base pulls # in curl's large manpage set.