Date: Fri, 7 Aug 2026 22:04:44 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Colin Percival <cperciva@FreeBSD.org> 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" Message-ID: <4on67s1-18r3-q637-599r-1391qn3n31s@mnoonqbm.arg> In-Reply-To: <6a75ffe4.1f692.2d347e65@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
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 <cperciva@FreeBSD.org> > AuthorDate: 2026-08-07 15:49:49 +0000 > Commit: Colin Percival <cperciva@FreeBSD.org> > 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:7home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4on67s1-18r3-q637-599r-1391qn3n31s>