From nobody Fri Feb 6 20:59:08 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 4f75zw64ZMz6QWdv for ; Fri, 06 Feb 2026 20:59:08 +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 4f75zw3jKKz3pXD for ; Fri, 06 Feb 2026 20:59:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770411548; 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=ILHicWVzhuKFESRHqtTRy17kIkMlEl8hsaAa9fsF9vw=; b=phekfFr/9lLjcUJNws6HhhEosSaReYrrbofoGncfzo1djBavc/xuwcCyo0NuCOEAoPQNQ3 EkmbuXeeVMMIH1joXGnEkyQI5d6IDVX1n0HKlE0zKsNG/8B17nnF5jTqK3dDYFyhWgKaO2 9bZSy0sUBCwRqCkN6B3kQOO5b2XphZhMyfsb6T95y7Z0D+CG+cLSdrGjbz7OWTeqU1tsoR 4jqJVTxUVsL0NxQm+AWLlFpUBJLmXHkgpFwG2qqE6rjFOeLmVevybmg7Kpzvt54A9B02/U L4BjGZTa/oVRFeEBbL9JhSs6MXzf2pG00ngS9jyoPEMbV8JAj1PaR5lmEBOFlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770411548; a=rsa-sha256; cv=none; b=KMlWrnfMIDeKAH7EW7QaSZYVBKvUNSypS+CesVgWkqDxAKuqg678wThEiDfip4bPiy0dxU O4wrkYw+E8sKhL+Y81o2dkyeDesQaUyHG+IEPKeOTkGxAABz/06LfVRR3wcivwQPbDKFnV BnE0ahE5vs0RwuxswNP8CSuoE327uwMCSaTfa99vGIHTXuUcNlT0q8H82PkvO4O08Nh7WY iyhCDqQRIMJpuamWmfcIcmhGAGE0VqRl+8l5gv+wVTRvN7OUrWAcarCvC9Y10hVpGXByGT o3w83QXMi9UH1QQdH3r3xSTLtY6RQdFQpxRyWqf5ynijCDFUhI0lE9UrnXTfLg== 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=1770411548; 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=ILHicWVzhuKFESRHqtTRy17kIkMlEl8hsaAa9fsF9vw=; b=jL5IikEQK+daQS2KLnhQV9ENO3skgkx94SZDZVwefqESK96TykoSTc3JbMlCWxJWiYovu0 iAIGqYwDOaqJqQwYu6G2jo1OTLYqvcji2VGfpIYg0NibZlX5fkLHvqcIzolbav0Z9m9Ndx a9GztrmrSCcRcvQ6dGAMHOWj7LhmBdiG5p34Xc54NLVcA9nh2LPlBTuftC5QoYDXqNgh5D mdT9mtpDAzTD4hAW+Fswonudk9buJlGNnkXIgZVL624X5Z/53dINlOT3GMV3LHmEdIQ5zK mFgBJI07keqU8TLOj7Ur4R3cLAQ2Gh2WNy5MNNdgxTKtH4O227SMpn5rxNPP4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f75zw2cYnzXZf for ; Fri, 06 Feb 2026 20:59:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43129 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 20:59:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: df3c9a8a5feb - releng/14.4 - Revert "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/releng/14.4 X-Git-Reftype: branch X-Git-Commit: df3c9a8a5febf3457c96238c2e9212dc369d377a Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 20:59:08 +0000 Message-Id: <6986561c.43129.1fc0ca38@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=df3c9a8a5febf3457c96238c2e9212dc369d377a commit df3c9a8a5febf3457c96238c2e9212dc369d377a Author: Colin Percival AuthorDate: 2026-02-06 20:54:04 +0000 Commit: Colin Percival 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.