From nobody Fri Aug 7 15:53:34 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 4hGpbM0KChz6nJNM for ; Fri, 07 Aug 2026 15:53:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGpbL6GTZz3trk for ; Fri, 07 Aug 2026 15:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786118014; 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=dI3jExlXwSntD24+tuyXRj2V9BLTXryTKziXzoyOokI=; b=PUA1HTj9XNXrw640KVyShSbbztS7+W0i047DFRffZj/8mFQz45yMb3GGfrL4kdYCRzXOJy ZYLowM6Dukf+jbHdOwCQaw88SNj2O/dKzrkoGYfE48Bbb2yhXMqzPpCUGIGkcUHczDuNBA yMbEbeelJMgsa8/3JUhZh+8m5m5Ixs0B8bzcYUNamRMd8rDl9jykwSlOQHH0tkU/shT9bh dtBQSpsec2WZniKYkIzOcbFB1zx97ZBJrc4QyZ9lweh/11AGWTjytYoKeNQbwZHfEEcbNm lqqdTQxq46CBlLnx9q3dMWl1OASIr0lPUbWxk6nsc5F/A91wyA4SJuKQcQZExA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786118014; a=rsa-sha256; cv=none; b=PG7FY9/yaoEtjp3Y6rfv4/8QPPTt7hGuCPe4vbTYOuLwkK+L21CRyiNqNfAltG9WHQM1/L GUk8yXpynVGHVqd/FrdMweUJwP5YyVuvHRqA7itxrW3WIx8CeVk1KbVHKSRKMAWjOX+20n NytrD20DugRy6esPcyynkgEvRWVquPxSIyB2SVmq/NSQYIBa288s3qhbSc0NZSYePaxKmR uOdAvF8SoHLZ3YujZDFXbCNUIIjVhB7Y4Bb4YL1Sdvb2XiSl5aZxRrXTB99okUl50mpdAI TyBye0wP37yEn20Q4/ZXDZ+qG4u4WXX+NdO6vFASetZ1Wv1rzAO6Prq9Is3NNQ== 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=1786118014; 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=dI3jExlXwSntD24+tuyXRj2V9BLTXryTKziXzoyOokI=; b=XAQE81DCv4I9iVJlYjQhj1qKvoOc0OX2lC8oYnKRmQt4zKIkeLg/udO89/DEbXfb4nd+2+ oLjzOsryVDjhH/U/PlSY/zAO0loaTJ46GY+ihD51zTSsxVKIvfSxZtdJR+MS/8Ze9XEaUA JUFp9DXa3SRhrgPnNjXNZUuLM+4gjJ7c/oVgPGnaXJjvKgXsghSdCPbbrqIXfOC6QOd6PB wvCln7iNM9fMTX3ThgOeubVfdXRe+U8fwdbItU7YfxJqXursKpyl0WFQyewA5TvfS6akX2 eVjWrSIyYVNIkLl3vNdadIblS02x63fagbQ4g/mj2GRlHlGQ8kWSSvSquO+fCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGpbL5CPFz1D20 for ; Fri, 07 Aug 2026 15:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f616 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 15:53:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: fdd93a36ebf2 - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: fdd93a36ebf26546cb103a1fad1f4ea54a891f31 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 15:53:34 +0000 Message-Id: <6a75ff7e.1f616.6359b66@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fdd93a36ebf26546cb103a1fad1f4ea54a891f31 commit fdd93a36ebf26546cb103a1fad1f4ea54a891f31 Author: Colin Percival AuthorDate: 2026-08-07 15:49:49 +0000 Commit: Colin Percival CommitDate: 2026-08-07 15:53:28 +0000 Revert "release: Ship firmware from kmods repo on DVD" This was a good idea, but we don't build metapackages in the kmods repo so it ends up breaking the release build. I might resurrect this change if/when the kmods repo includes the wifi-firmware-kmod metapackage. This reverts commit bda8028146694ee490543b35e3349e060936fde4. MFC after: 1 second (cherry picked from commit ca0cff79320d49d3f10bd3aa3c472fa450a5c494) --- 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 d2db295c53c8..c2e64c43a56f 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_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 2f56cf794973..823c369f011f 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_MAIN=" +_DVD_PACKAGES=" comms/usbmuxd devel/git@lite editors/emacs@nox @@ -21,6 +21,7 @@ filesystems/ntfs misc/freebsd-doc-all net/mpd5 net/rsync +net/wifi-firmware-kmod@release ports-mgmt/pkg shells/bash shells/zsh @@ -36,10 +37,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! ***" @@ -79,25 +76,18 @@ 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_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 @@ -108,8 +98,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.pkg' symlink so 'pkg bootstrap' works # using the on-disc packages.