From nobody Fri May 1 06:27:54 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 4g6Lgv0Wd9z6bySY for ; Fri, 01 May 2026 06:27:55 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6Lgt5gqzz3XrJ for ; Fri, 01 May 2026 06:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777616874; 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=QjFXkQJ3yLoObBcBlwlnAW2H6/fb21giJjlnMNaSc1U=; b=FqckMUVJw9dFwjbgcKsraVH3kNZblU1egy4SPZE0+etAowUqZQ+ckhssJ0qkKg0khyoG0+ /8/tnPVUeil3zQ1TSNapFP6FWDHps5TUUiFnDxqTGFqEpCoVzgkTMEPGXRuDb7n5XKnUln OkDoRlW85xNehxnHsHCX3zIRyAVkTmP8yf2GTHJzWbaHXjy9JdQuqWkN5OGQW0m3h7tGDf OTRKJQDekXgcpH6JooCCxjpYZBrrqF8Yz1T/mWGGPiMe+XMuW51HCk56CMTocZ2ZJ7Huqn 5KHjHz+q2GNCxLnEpleqeIu+xGDFIkBlm8IhR4d4J9KVcNSGFwmCm8y8LMDHXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777616874; a=rsa-sha256; cv=none; b=cOpcVsrnbLWXhyMUcH8VypDIm0NnQvMnhRnCWE9WuMH5fute4kIMyWrKhVZt8EX7x2VVIa 595hyeJvbjQSA/Uco6Y79popYayTYOW2TGSge9LFTFGrVZqzN45boif+oEMMYdqAOc/Xnt uU0I/NiUKrn3NhBoHMsz4xqLKwvBcqB7+DW8Z3OGBtGgIrYezXuEohVOzmtsypJbIJU0bc 6xcGucO1vHQn1/V5EN19IPDigH6h/XgG5Uu6+pJbaYXqYOeMAmkw3Ri78z5fhLuNeSCciS PyPnSvay9YmsjuU2HWMcjFrSxVefwE3Gpghody2lpjoUrdr+QpViyWiQOR/QwA== 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=1777616874; 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=QjFXkQJ3yLoObBcBlwlnAW2H6/fb21giJjlnMNaSc1U=; b=cqopTn3tQGxkFGX3bQ5egMvvH0tUhUcHqiz3asNMk2xqoxDGdYd5FFYYawru8W29TNeL3R KeXBGzOFBtpSemoXwFnwfKGV7LnpZvIEjy0AKs2JAmqDLbr1iH1gmYbLqAIwm/REIxCFdL /aYJNIrmd4GzI54LyP+zumruWrVDWfzayy9CHonlxMVhtzcA4PivimP+7rEHWBdB71wVD3 WBPbAY1M+ysPdlPRpwc1D54hf0Ft3kJkWDyMdc7HgkG2bVnNw7KnCjyWw9MbxkhD1WtBEZ OnNFXY1BrkYbSvqngmvqir8uufMYJi2E03//83PW0INzZVIYGXMu+UzvY7hYaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6Lgt3gwGznQH for ; Fri, 01 May 2026 06:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32177 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 01 May 2026 06:27:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 58777180c5b0 - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 58777180c5b0f239c78fa9298aeb22c867e2cd00 Auto-Submitted: auto-generated Date: Fri, 01 May 2026 06:27:54 +0000 Message-Id: <69f447ea.32177.4869f2e6@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=58777180c5b0f239c78fa9298aeb22c867e2cd00 commit 58777180c5b0f239c78fa9298aeb22c867e2cd00 Author: Colin Percival AuthorDate: 2026-05-01 06:26:00 +0000 Commit: Colin Percival CommitDate: 2026-05-01 06:27:41 +0000 Revert "release: Ship firmware from kmods repo on DVD" As we did in 14.4, this needs to be backed out of 15.1 to fix the build. We're going to ship kmods built on 15.0 instead of 15.1 on the DVD but hopefully those will work. This reverts commit b0fbed20ceb9b899e7e20bf785e9d303608bc7a0. 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 5c4ec76150da..6c9f176cce6a 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 @@ -19,6 +19,7 @@ editors/vim 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! ***" @@ -77,25 +74,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 @@ -106,8 +96,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.