From nobody Thu Feb 5 18:21:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6QXS0gjcz6R0Rc for ; Thu, 05 Feb 2026 18:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6QXR6pkSz483F for ; Thu, 05 Feb 2026 18:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770315688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6VdpsMug0pgWQcWKySyw4fV/l8COnvqHvis3RjnvWs=; b=CCe27XA9XwsMTHujoXI0AKWg68IF0cAskvYBWS4hD1AGrIL0ljthGJDfjKNMiym3zAuQh8 Ejw+JZKyNBdiRf1fifnKEvPW5IyMIyXR0a4SOvE2HX0zjoMMV+TKTSr1iDeUSUMrA/sCVa LzDsiWVloGmmcbUAHvpFGdsNkWVDHX8/wv6XSDkEv/jIR9NM5DwUu1fwDeNleZjQvJI4fh wJQxkbsTZH52REpMu8SORVvnwgzMtKDuNWIwraNfY5VaH3PcxiCv0uSsY5KIwq2X3XWy77 ZAAV3Uub/37GZ4uZuBnfHuMyAvCK5jn8nuib7+0jLfbuLm1hGdjxd/lTfKU1rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770315688; a=rsa-sha256; cv=none; b=BmeHvQOTn70UlgFvlvVb+R29Ny3bjOorFnKCyCjE7tjZLDv5/UrpEy+IkVn0mrhV9Swr2H iKv73378s9wrHLCGOX7Csuaya/WU78tDjkKb4XqD2A4XUP42jCe4boFFtl+bQz43B0zIcT vKT24FcCYeK3Buz8LPNF2rNqkFeNObE1A/euVEn0E1mQF9/HCvfweuDkXJzLRS6vQXBL5f aStipVoTp+AwastQQw50pRQ8wBBtO1iM0jugmZjTHv9QmdxBnKNixkKVLopV1j9PqSiYRT khTNh6PKp2Jrusa4opjW3Os/j84MF5lA1+slsF048hAZMZmx93a+yKLrQ7pccQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770315688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6VdpsMug0pgWQcWKySyw4fV/l8COnvqHvis3RjnvWs=; b=ZAv7DVQXlKGRPObV/F6H52xG8KDNXy+H5Mkjkwfo18DxXZuV7ImUKGR2JTZaB/YjYmtsNq Y9Xu9Yj1mikeZH0T2xgvQjqpsViEGbDmesfkYjehNqPW+wzZPP2sHNG6ZEPkWZxyM/hbDN I2GI0jlQ3kln66em+s/gpdANkQ7S8rpFmPwY2hDqABuN5GV0oO1NV9cnZ4BD3xY9eUywIU mChiCWw7mUYLVP8tPW/uBHiqi2poHuFNU6z/l8IbcsRBhS/hDBKSrM1YRsou6ieAaXumbg gNpzLN9z7DujCciAdNFOYunYQEYYAJTbJGwoGSc6hkiFGDV8u8i0KvlMTc/8zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6QXR6LzNzhVp for ; Thu, 05 Feb 2026 18:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32deb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 18:21:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 8c1de3109776 - stable/14 - release: Ship firmware from kmods repo on DVD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c1de31097763ce1d918a3f82c61fd8d30edbe75 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 18:21:27 +0000 Message-Id: <6984dfa7.32deb.7fdc90a7@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8c1de31097763ce1d918a3f82c61fd8d30edbe75 commit 8c1de31097763ce1d918a3f82c61fd8d30edbe75 Author: Colin Percival AuthorDate: 2025-09-16 18:43:36 +0000 Commit: Colin Percival CommitDate: 2026-02-05 18:21:17 +0000 release: Ship firmware from kmods repo on DVD The packages for X.Y-RELEASE are a snapshot of the quarterly branch for stable/X, i.e. typically built on X.(Y-1)-RELEASE. (The case of Y=0 is an exception for obvious reasons.) This works for most ports but not for kernel modules, which may need to be built on the release in question; this is why we have a separate "kmods" repository. Make sure that we put the packages from the kmods repository onto the mini-pkg-repo on the DVD rather than shipping unusable firmware. Reviewed by: bz MFC after: 1 week Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52581 (cherry picked from commit bda8028146694ee490543b35e3349e060936fde4) --- release/pkg_repos/release-dvd.conf | 7 +++++++ release/scripts/pkg-stage.sh | 25 ++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf index c2e64c43a56f..d2db295c53c8 100644 --- a/release/pkg_repos/release-dvd.conf +++ b/release/pkg_repos/release-dvd.conf @@ -5,3 +5,10 @@ release: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +release-kmods: { + url: "pkg+http://pkg.FreeBSD.org/${ABI}/kmods_latest", + 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 2c70b59be241..d490e83ba9ec 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -12,13 +12,12 @@ export ROOTDIR="$PWD/dvd" export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" -_DVD_PACKAGES=" +_DVD_PACKAGES_MAIN=" 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 @@ -35,6 +34,10 @@ 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! ***" @@ -57,18 +60,25 @@ 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}; do +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 if [ -d "${PORTSDIR}/${_P%%@*}" ]; then - DVD_PACKAGES="${DVD_PACKAGES} ${_P}" + DVD_PACKAGES_KMODS="${DVD_PACKAGES_KMODS} ${_P}" else echo "*** Skipping nonexistent port: ${_P%%@*}" fi done # Make sure the package list is not empty. -if [ -z "${DVD_PACKAGES}" ]; then +if [ -z "${DVD_PACKAGES_MAIN}${DVD_PACKAGES_KMODS}" ]; then echo "*** The package list is empty." echo "*** Something is very wrong." # Exit '0' so the rest of the build process continues @@ -79,7 +89,8 @@ fi # Print pkg(8) information to make debugging easier. ${PKGCMD} -vv ${PKGCMD} update -f -${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES} +${PKGCMD} fetch -o ${PKG_REPODIR} -r release -d ${DVD_PACKAGES_MAIN} +${PKGCMD} fetch -o ${PKG_REPODIR} -r release-kmods -d ${DVD_PACKAGES_KMODS} # Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works # using the on-disc packages.