From nobody Thu Feb 5 18:20:50 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 4f6QWr02fwz6R0hK for ; Thu, 05 Feb 2026 18:20:56 +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 4f6QWq6kyMz47hs for ; Thu, 05 Feb 2026 18:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770315655; 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=EGK3VZ89CkaNbaRPthFGF9Z++qW5vwOmbeHGuP9AvKE=; b=pDkewF8xXzbfXRsPMn7UkT08zF5maCfdLTDjMk/UCLtO5vIvYxKEm5UfwRJW8wD67Mtw+2 HDFpODN5qHO1DLGWAAonmPf0yiGIw88JO3ocJV+hMyIjWrpVm1ORPNLWQamAHGS6QYFDP7 si+JYA7eXjbgQnm/vFXBPDQE1Inx50If2EBrOvsWDB3Pd2DiPnPw88n6JFXP8CB4jB5CSt UwvhqO6FcNqKF4r+8xLIDff4h0rvAJ/N+AqRdik3vBtVZxSh4VBN2JVGSREKYJt6PAb7Sx C1/4iAVpGBakCxykcs9utr9tnr86C1T15lPeC/eL2gQoOZdP33b0MQfCt0UZEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770315655; a=rsa-sha256; cv=none; b=Tf6pKs19GZvix/vjaORoRqA+C9aU5FC7KMx70wv+Qk9ROwK6hlWU5j7j1OD6GC/EuH+/dJ QRz74Sn5bpHT34oqZVUfhPUUCkfihS3aS70DW0z23wyZUETb4A0+TEQ0fRrKruKk5e+4Qb Ae0O9n+AkyJ22W+VLxF4iRGsji5InLjcMiJ/3bGLOikRB1q/JIaX+vpQFJrOm04IhzO1CK hya/cGoG2In/NkbjWqgasYJwfFOxdMSHmt7WBVSlEzW29uNwJ6Bepfl/3ZPWDj2TBUZM5S 68shiv10OSA0vY059uR8GwuaDGij7ywM/x/obYjwL7neMuXynVKcKDC3RPqJ/w== 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=1770315655; 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=EGK3VZ89CkaNbaRPthFGF9Z++qW5vwOmbeHGuP9AvKE=; b=aKxdAnJ+eYqfsDkdXKUKR9BoNs2qlDQ5ZGHHmB9xBZ7640eL+jLS5n2UAtkiyZY9yAnaM7 MSaxOl7lGiKWV1G7BtcPgPauOjHH6vKh5ko9lC9tKvUVUouWzHhP6GeHxKu+5XR871V1ZJ PF0mCumdTpm2L+Js4KssDaa5SA7WBulY96km5ptGozPVJhJO5OO+f+cXAXAUA2frXWkbdb lpxycHTuu1M8qTcCMLmMhbbzXBbza8xBbtOZrzLDbs2EtAYK6smMJBqrGSu7f4rwpI7OxP oec7cPE3FmX947Xn/LLp7q1XH4KSc4yeCH+tKq2b58BRDdNvHMhVBRsqzYVvDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6QWq5w4WzhS9 for ; Thu, 05 Feb 2026 18:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33647 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 18:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b0fbed20ceb9 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: b0fbed20ceb9b899e7e20bf785e9d303608bc7a0 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 18:20:50 +0000 Message-Id: <6984df82.33647.6600aa5@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b0fbed20ceb9b899e7e20bf785e9d303608bc7a0 commit b0fbed20ceb9b899e7e20bf785e9d303608bc7a0 Author: Colin Percival AuthorDate: 2025-09-16 18:43:36 +0000 Commit: Colin Percival CommitDate: 2026-02-05 18:20:41 +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 b64fe5e5f1e5..5d4d267b150f 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -13,7 +13,7 @@ export REPO_AUTOUPDATE="NO" export ROOTDIR="$PWD/dvd" export PORTSDIR="${PORTSDIR:-/usr/ports}" -_DVD_PACKAGES=" +_DVD_PACKAGES_MAIN=" comms/usbmuxd devel/git@lite editors/emacs@nox @@ -21,7 +21,6 @@ editors/vim misc/freebsd-doc-all net/mpd5 net/rsync -net/wifi-firmware-kmod@release ports-mgmt/pkg shells/bash shells/zsh @@ -37,6 +36,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! ***" @@ -78,18 +81,25 @@ 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}; 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 @@ -100,7 +110,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.pkg' symlink so 'pkg bootstrap' works # using the on-disc packages.