From nobody Fri Aug 7 22:04:44 2026 X-Original-To: dev-commits-src-branches@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 4hGyqp06Xfz6nr4L; Fri, 07 Aug 2026 22:04:54 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGyqn6YpNz3S52; Fri, 07 Aug 2026 22:04:53 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786140293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ot0OGgHP2Z/JtuNCEQOXnkFZzJbc3MgCFZJ+jAuEcxU=; b=x9LN+WMLfutteHOxCn9z0GCbh0pwyuwG1dG9RL5ro4WxeYpC2o/4HI3a86eLCu6Y+Lk8ED RzfCYqj7fqb0hzo0D5ZJIfw95EtTAbIR3dxpeDVBxKZM/No0chJdJ5zeLyl0tu/NyZWMaC HYds26DbqPoIxsxxTvO5duEHgmhQ/NqcLSPOxlTvlJCawvbRSzFZn1gHwr5GpDp7hFKfl2 QnuyOuPTDWPrqXeKX2EtBRCm8LBjSkYouAIUzVP0oz27cIOGZWc+OJWMcLWF7Ht952aNba xevi/V3ui2o+lfm8md2NSZoOzI16BokfW7C/2pApv1+kFrWCgdWc+//larWvxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786140293; a=rsa-sha256; cv=none; b=Bbx4xvkTIjoJggqhA1htBkvSFso9PGhL7f1MqSy8gjTTdMS6jNLpn4jRGGjD+8ECxqy70M uk1a1z/F3GD8bqzaM7Rie1/IdsqShcef3b7AlyzOXV00KzSKr264/Tz6BgrxjUS628OuHb bpzZeS4IULC7gI2/PQAir8oOMLZ+Ai90P9K5+CTrElIZzac2p0/VSzmvG+VrMx3m9F070F gBfzPUSZMzY2jfChaSnsDSEizm2dzx+1E8Agbh9czGkacvGxPP0sowYBpzJWvupdMw90L+ kL6MFc4yeXxkLMLlOMkm4nF6SOiGvMkKEdZ4I/9BLfNPmILBMuL4l9MbMfnWNQ== 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=1786140293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ot0OGgHP2Z/JtuNCEQOXnkFZzJbc3MgCFZJ+jAuEcxU=; b=P2zAQ3obuj6LLAtlFODoci9jO5QgHJE7ntZLGL3fKJCoMJE1psR60JyX5jhO+2JxANPOkP fWJDn9emNGBMYtcY5Gu7dO26UvSq+2ihLNk7X9IuAPsJJeYoUBTZP+Om8GMUTjWNMROYUN 2s6Nja2MTPxprduEbUZaKTrvYrNE1zr0XYVV3EbD2qY6XLfc6+BcZCKK3HlGaYKdtxxvPw M1nT6oqjjgdvH/JA2kHT6JpLeHtk/Pe7Pgj211KZekDEt1nJVvOkbkCbVGKijiRWqXBjkZ j5yMq3l7ZrgqXz9v7PPj4Urw8u2xsfUa1/FvwNyfS7rvyymoNubHKw5qm83Rwg== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "YE2" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4hGyqn3fCNzpdh; Fri, 07 Aug 2026 22:04:53 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 2D9A0A64805; Fri, 07 Aug 2026 22:04:15 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 5FCDC2D029E9; Fri, 7 Aug 2026 22:04:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 0klpKefxHocR; Fri, 7 Aug 2026 22:04:45 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id EA4032D029D8; Fri, 7 Aug 2026 22:04:44 +0000 (UTC) Date: Fri, 7 Aug 2026 22:04:44 +0000 (UTC) From: "Bjoern A. Zeeb" To: Colin Percival cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: f68ca7c41df4 - releng/14.5 - Revert "release: Ship firmware from kmods repo on DVD" In-Reply-To: <6a75ffe4.1f692.2d347e65@gitrepo.freebsd.org> Message-ID: <4on67s1-18r3-q637-599r-1391qn3n31s@mnoonqbm.arg> References: <6a75ffe4.1f692.2d347e65@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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=US-ASCII; format=flowed On Fri, 7 Aug 2026, Colin Percival wrote: > The branch releng/14.5 has been updated by cperciva: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f68ca7c41df4c3a14f645caec5941832eaa4ca95 > > commit f68ca7c41df4c3a14f645caec5941832eaa4ca95 > Author: Colin Percival > AuthorDate: 2026-08-07 15:49:49 +0000 > Commit: Colin Percival > CommitDate: 2026-08-07 15:55:00 +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. I have today not received answers on multiple emails/questions over the last year-ish how where when and why certain packages are build in the kmod repo and not and why some changes were not picked up there while others had happend. The wifi packages no longer need to be in the kmod repo as we are no longer building kmods but they still have kmod in the name. If you know who can answer question and document things and can change the process, that would be very helpful. > This reverts commit bda8028146694ee490543b35e3349e060936fde4. > > MFC after: 1 second > Approved by: re (cperciva) > > (cherry picked from commit ca0cff79320d49d3f10bd3aa3c472fa450a5c494) > (cherry picked from commit daf81f32f834f8619dceca745758983ccc767866) > --- > 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 cb613950c916..3425534bed7e 100755 > --- a/release/scripts/pkg-stage.sh > +++ b/release/scripts/pkg-stage.sh > @@ -12,7 +12,7 @@ export ROOTDIR="$PWD/dvd" > export PKGCMD="/usr/sbin/pkg --rootdir ${ROOTDIR}" > export PORTSDIR="${PORTSDIR:-/usr/ports}" > > -_DVD_PACKAGES_MAIN=" > +_DVD_PACKAGES=" > comms/usbmuxd > devel/git@lite > editors/emacs@nox > @@ -22,6 +22,7 @@ filesystems/ntfs > misc/freebsd-doc-all > net/mpd5 > net/rsync > +net/wifi-firmware-kmod@release > ports-mgmt/pkg > shells/bash > shells/zsh > @@ -38,10 +39,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! ***" > @@ -64,25 +61,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 > @@ -93,8 +83,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. > > -- Bjoern A. Zeeb r15:7