git: df3c9a8a5feb - releng/14.4 - Revert "release: Ship firmware from kmods repo on DVD"

The branch releng/14.4 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=df3c9a8a5febf3457c96238c2e9212dc369d377a

commit df3c9a8a5febf3457c96238c2e9212dc369d377a
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-02-06 20:54:04 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-02-06 20:58:55 +0000

    Revert "release: Ship firmware from kmods repo on DVD"
    
    While all of the net/wifi-firmware-*-kmod packages are in the "kmod" pkg
    repository, the net/wifi-firmware-kmod metapackage itself is not; this
    results in the DVD build failing when it can't fetch that.
    
    I'm not sure if the correct fix here is to add kmod-related metapackages
    to the kmod repository (even if they themselves do not contain kmods) or
    something else; but this needs to be backed out at least temporarily so
    that 14.4-BETA1 can happen.
    
    This reverts commit 8c1de31097763ce1d918a3f82c61fd8d30edbe75.
    
    This is a direct commit to releng/14.4 since it is not yet clear whether
    this should be permanently removed from other branches and there is no
    urgency to do so (since DVD builds are disabled by default).
    
    With hat:       re
    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 d490e83ba9ec..2c70b59be241 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -12,12 +12,13 @@ export ROOTDIR="$PWD/dvd"
 export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}"
 export PORTSDIR="${PORTSDIR:-/usr/ports}"
 
-_DVD_PACKAGES_MAIN="
+_DVD_PACKAGES="
 comms/usbmuxd
 devel/git@lite
 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!    ***"
@@ -60,25 +57,18 @@ if [ ! -z "${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
@@ -89,8 +79,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.txz' symlink so 'pkg bootstrap' works
 # using the on-disc packages.