From nobody Fri Jan 30 17:42:25 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 4f2jy92LqDz6QD87 for ; Fri, 30 Jan 2026 17:42:25 +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 4f2jy91ffsz3CBL for ; Fri, 30 Jan 2026 17:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769794945; 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=9E17RT0h3uvhwweq3dJTt+4sEA5pbKZojzRry8GtwAk=; b=CmPShiNtQMtyRGPltcGNmCz67MjCplp4c3TMv5YB/OkDmnCJk6Xtck69v9RUMAD18id1jV Ggt7Ra99h+RKwmQ9BTpc4hhmUyW7yEz8Ht2Y8dO2A5pjMbamMautpxzv4xR68elqufvrK6 DTftHRv1bkYhI43vvwSycgU6VeQTzveo4WcCEjsGmecBHHTmQHFclEyKXRn6ZODUMdxM1l z37Edmuw7VAg+2p0z3Uc0sCUASFZJw4i0Rd5SFD7vV06vgeCJWMsMa3alNUJw0c28RcMJy YHfc7GxM5PPBSxcjQ4mzoeYwUxc5CgQ47SPTioN+uMESEca+NrH1Ew5S8fkKkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769794945; a=rsa-sha256; cv=none; b=OKwOF4/HYHX+sg74PyZTMEzg0VosmX+k9kUUcof4shRD5I/+odHCpDOPU0NeoY6p01bjbJ H+ECy5pbHZ0hq7kXVVQxYtkHWuHsYdZ75kt6q5FTL8r4BuQ45lIT8qEZ1fajc0CKJllpzF 3fA6eChTpeeJwQ1CrQzfNh+6tAya2ZWbNgntIJSOKjrJGou408w9TI1MJxG+7oo9FpttSK u5Fyt2zCKBaPDcWVfvyCP3I8KQuGhgBkM2mvf9v+6W6P1umATgSak3ZgdSOTDQUj6HFijS sc4lC7wrAHfXzTAWnIGhEEsSG7fDeza0urlCRg8p86pcveIiovSh7DoIzpLM1g== 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=1769794945; 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=9E17RT0h3uvhwweq3dJTt+4sEA5pbKZojzRry8GtwAk=; b=gZMM6d9NLkh0Yvxv4rAacbKTPCx732XMz0jYS9nXIWELGT4O2K5AX8+NfosZBnPQk6vc6a Wi81QP/oH66VO9biy0TPaczz3EF+sR2n17w0Gpo82+3nTR0vCfMmbJfRNh3aPqrsQgrBpY H1zo6ZEOmDOTpPdTZFtDahpFszfSPNoBKtFwKnUZHITCwWSyBTkNfdly93o31ox8HwYVGp ne/Vi3/Eju4M3djL6/tzCb7BKbq4heoziaSKbjZU1rx4rCsq3L/AjP/KvUQPJW66wlRZ8N YfDbDKRIk9Ha7AUghx/qLRz/ngHfS/tYUJhZCncKW7XzoFMEe7t0KihryyG5Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f2jy918FKz35R for ; Fri, 30 Jan 2026 17:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42d3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Jan 2026 17:42:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: bda802814669 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bda8028146694ee490543b35e3349e060936fde4 Auto-Submitted: auto-generated Date: Fri, 30 Jan 2026 17:42:25 +0000 Message-Id: <697ced81.42d3a.4da22ffa@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bda8028146694ee490543b35e3349e060936fde4 commit bda8028146694ee490543b35e3349e060936fde4 Author: Colin Percival AuthorDate: 2025-09-16 18:43:36 +0000 Commit: Colin Percival CommitDate: 2026-01-30 17:41:51 +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 --- 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 d06fc9dd1d41..00b83d9c51f0 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=" +_DVD_PACKAGES_MAIN=" comms/usbmuxd devel/git@lite editors/emacs@nox @@ -19,7 +19,6 @@ editors/vim 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! ***" @@ -74,18 +77,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 @@ -96,7 +106,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.