From nobody Thu Nov 21 23:26:27 2024 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 4XvZ9w0bwrz5dl2w; Thu, 21 Nov 2024 23:26:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XvZ9v4Qpzz4RQD; Thu, 21 Nov 2024 23:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732231587; 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=rk4efzCRH/ebAqpX4y7E6/QpOULt/Js0GRdgaqTKu4E=; b=m7lp+oF8nKh7h1yBKlFfep1G4TZpwYpOuVAzN1CZfL6zYe8oNV6PkukACtlhIuPaPkat2E xHmc1EgRJ/CCjIOA/L6N1D+tY72Vurfv4vGjMWKaU71hfUEUA9tBiTW63nA6vizaaODEUq VsAuGl0SpRU9SRH5kaolB1U3LvFK9rgGl4ioktw0z6Jo04SyHlIl594iCysWKWv6QcJwlY Y6KPHDQq61NQnTWtfEWbnlUDGbConm88kq1RIVjrDt/7fE0o+ftYewRU3u6iPiXSWsksKj qFBsr2bNxAAOta7g80jrs1BFHAquN20MZS2/fsyRIziuEOYZ1/bA9b4dys0VRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732231587; 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=rk4efzCRH/ebAqpX4y7E6/QpOULt/Js0GRdgaqTKu4E=; b=t7OKrGZ21q5/P62e9tbPI7TnUY/4TEFUlWFPjMF2+ipzMXyyswvjUy/4E0OfOv03vGAJT1 qa/73If6vLJfxcH4K59PsMRv5drylJvAtuaws/5TuVZavDHcdbBHVEESoSgOLttfPFPlkk 1RPVVS4sNH7rLLzjfGu8RyANPc90KPVpM2nBTVn4srqxVHunaa9xusi7I/aMvoZ+Q7s0FY e24MpMquZmUdwzwgwpY7nKhO4QrtISp9a/4h58QvFHhPzyU7hodCRM7wCLxAv50/B5xj0z yCe/34L/oRmzc7A2rAF0Q284g+ejeYa8c+yBx7CKHp4yAXygXdc/zsOggoGG3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732231587; a=rsa-sha256; cv=none; b=QzqKpX2C7pn5IgJeAGzm5U1BxVr/1XOtjaVVZLoUTLNOcYVv7pllBqXnHeESyojl09jtQR D2/xseOuQQAIqOVEFNNJD1/+8JeOo8GE3MqS+g/fYEou9hBaZh+5Iitn4dRvY3RLUsqOi9 EI0sCDB7K223uxWoGX8aIS0YxdUxypDByKFRJtWp5vPMkOc+qQXCpi5Krt8dK5iVG7umSW eNr9zpOh2StgtuWrVxMs5mLLbUZJoJLPLwjpHh6OOEm1kLVM9QXu1pYUXRGEb9AZT/v37L TFbr8vGpyI+Q0rhOgpl0hznn+gZYP0puiK3vEECORDzlgQeD98GgHrrsGr2kAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XvZ9v3ggCz10lt; Thu, 21 Nov 2024 23:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ALNQRF5021424; Thu, 21 Nov 2024 23:26:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ALNQR1e021421; Thu, 21 Nov 2024 23:26:27 GMT (envelope-from git) Date: Thu, 21 Nov 2024 23:26:27 GMT Message-Id: <202411212326.4ALNQR1e021421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c5b8ed13c9ef - releng/14.2 - release: install wireless firmware onto disc1 and 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: c5b8ed13c9ef52767b2c495b3f794ee238e183d7 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c5b8ed13c9ef52767b2c495b3f794ee238e183d7 commit c5b8ed13c9ef52767b2c495b3f794ee238e183d7 Author: Bjoern A. Zeeb AuthorDate: 2024-11-02 23:51:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-11-21 23:24:53 +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 Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D47407 (cherry picked from commit 7e2996c1f5b4e684cae40c2418b68061df9997d9) (cherry picked from commit b62012538e967b22736e8c2214b222f21146bddc) --- release/Makefile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/release/Makefile b/release/Makefile index 3d96880d1661..c5970b184b96 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 @@ -186,6 +197,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 @@ -256,6 +271,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