Date: Fri, 01 May 2026 06:27:54 +0000 From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 58777180c5b0 - releng/15.1 - Revert "release: Ship firmware from kmods repo on DVD" Message-ID: <69f447ea.32177.4869f2e6@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=58777180c5b0f239c78fa9298aeb22c867e2cd00 commit 58777180c5b0f239c78fa9298aeb22c867e2cd00 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2026-05-01 06:26:00 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2026-05-01 06:27:41 +0000 Revert "release: Ship firmware from kmods repo on DVD" As we did in 14.4, this needs to be backed out of 15.1 to fix the build. We're going to ship kmods built on 15.0 instead of 15.1 on the DVD but hopefully those will work. This reverts commit b0fbed20ceb9b899e7e20bf785e9d303608bc7a0. Approved by: re (cperciva) --- release/pkg_repos/release-dvd.conf | 7 ------- release/scripts/pkg-stage.sh | 25 +++++++------------------ 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf index ebe29b72df99..600c309d5979 100644 --- a/release/pkg_repos/release-dvd.conf +++ b/release/pkg_repos/release-dvd.conf @@ -5,10 +5,3 @@ release: { fingerprints: "/usr/share/keys/pkg", enabled: yes } -release-kmods: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/kmods_quarterly", - mirror_type: "srv", - signature_type: "fingerprints", - fingerprints: "/usr/share/keys/pkg", - enabled: yes -} diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 5c4ec76150da..6c9f176cce6a 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -11,7 +11,7 @@ export REPO_AUTOUPDATE="NO" export ROOTDIR="$PWD/dvd" export PORTSDIR="${PORTSDIR:-/usr/ports}" -_DVD_PACKAGES_MAIN=" +_DVD_PACKAGES=" comms/usbmuxd devel/git@lite editors/emacs@nox @@ -19,6 +19,7 @@ editors/vim misc/freebsd-doc-all net/mpd5 net/rsync +net/wifi-firmware-kmod@release ports-mgmt/pkg shells/bash shells/zsh @@ -34,10 +35,6 @@ x11/xorg x11-wm/sway " -_DVD_PACKAGES_KMODS=" -net/wifi-firmware-kmod@release -" - # If NOPORTS is set for the release, do not attempt to build pkg(8). if [ ! -f ${PORTSDIR}/Makefile ]; then echo "*** ${PORTSDIR} is missing! ***" @@ -77,25 +74,18 @@ if [ -n "${PKG_ALTABI}" ]; then ln -s ${PKG_ABI} ${ROOTDIR}/packages/${PKG_ALTABI} fi -# Ensure the ports listed in _DVD_PACKAGES_* exist to sanitize the +# Ensure the ports listed in _DVD_PACKAGES exist to sanitize the # final list. -for _P in ${_DVD_PACKAGES_MAIN}; do - if [ -d "${PORTSDIR}/${_P%%@*}" ]; then - DVD_PACKAGES_MAIN="${DVD_PACKAGES_MAIN} ${_P}" - else - echo "*** Skipping nonexistent port: ${_P%%@*}" - fi -done -for _P in ${_DVD_PACKAGES_KMODS}; do +for _P in ${_DVD_PACKAGES}; do if [ -d "${PORTSDIR}/${_P%%@*}" ]; then - DVD_PACKAGES_KMODS="${DVD_PACKAGES_KMODS} ${_P}" + DVD_PACKAGES="${DVD_PACKAGES} ${_P}" else echo "*** Skipping nonexistent port: ${_P%%@*}" fi done # Make sure the package list is not empty. -if [ -z "${DVD_PACKAGES_MAIN}${DVD_PACKAGES_KMODS}" ]; then +if [ -z "${DVD_PACKAGES}" ]; then echo "*** The package list is empty." echo "*** Something is very wrong." # Exit '0' so the rest of the build process continues @@ -106,8 +96,7 @@ fi # Print pkg(8) information to make debugging easier. ${PKGCMD} -vv ${PKGCMD} update -f -${PKGCMD} fetch -o ${PKG_REPODIR} -r release -d ${DVD_PACKAGES_MAIN} -${PKGCMD} fetch -o ${PKG_REPODIR} -r release-kmods -d ${DVD_PACKAGES_KMODS} +${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES} # Create the 'Latest/pkg.pkg' symlink so 'pkg bootstrap' works # using the on-disc packages.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f447ea.32177.4869f2e6>