git: 7e2996c1f5b4 - main - release: install wireless firmware onto disc1 and dvd

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=7e2996c1f5b4e684cae40c2418b68061df9997d9

commit 7e2996c1f5b4e684cae40c2418b68061df9997d9
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-11-02 23:51:07 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-11-20 13:05:04 +0000

    release: install wireless firmware onto disc1 and dvd
    
    Wireless driver firmware is no longer added to the src tree.
    In order to have wireless support in the installer for the new drivers
    we install the firmware packages onto disc1 (and memstick) and dvd
    if built on FreeBSD and NOPKG is not defined (to not break cross-builds
    from Linux or OSX and to allow people to opt-out).
    
    Sponsored by:   The FreeBSD Foundation
    Submitted by:   cperciva (the orig. commands and where to place them)
    Reviewed by:    jrtc27
    MFC after:      6 hours
    Differential Revision: https://reviews.freebsd.org/D47407
---
 release/Makefile | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/release/Makefile b/release/Makefile
index 9617df7ffd48..9d5b64dae271 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -70,6 +70,17 @@ VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH}
 .endfor
 .endif
 
+.if ${.MAKE.OS} == "FreeBSD"
+# For installing packages into the release media.
+.if defined(NO_ROOT)
+PKG_ENV+=	INSTALL_AS_USER=yes
+PKG_ARGS+=	-o METALOG=METALOG
+.endif
+PKG_ENV+=	ASSUME_ALWAYS_YES=yes
+PKG_ARGS+=	-r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos
+PKG_INSTALL=	env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} install
+.endif
+
 .if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL)
 VOLUME_LABEL=	FreeBSD_Install
 .endif
@@ -180,6 +191,10 @@ disc1: packagesystem
 	    do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
 	done
 .endif
+.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
+# Install packages onto release media.
+	${PKG_INSTALL} wifi-firmware-kmod-release
+.endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@@ -252,6 +267,10 @@ dvd: packagesystem
 	    do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
 	done
 .endif
+.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
+# Install packages onto release media.
+	${PKG_INSTALL} wifi-firmware-kmod-release
+.endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf