From nobody Thu Nov 21 00:05:26 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 4Xtz5M0xDNz5dwJH; Thu, 21 Nov 2024 00:05:27 +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 4Xtz5M0FTLz4DTZ; Thu, 21 Nov 2024 00:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732147527; 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=ySko/hqykwmMp1Q3TDY4LCZ5TnHgPX27dDFlUmUKMlc=; b=KBgGFjwha7xOCqokZ8e5bqb+B9DFVABWp+Oc7wCATmKNnJQ3u/BY979U3rews3rCRMPseV y29XU7qFBD5pdlbnzhHKItV4xGChZxx6Pl83YP6qBhHWuB7rHvUx8UGyh6W1xOqpZ4Hv1B qgdA8ObNUrDjuafE+UkpR/sForASi4MZ3ir3kEv17tPlfB8EMJc1xrjqtzHm95xp8EosLA Ny4OxmsaIkbO8vtLOmBm/98AemKZbq8pbgYAF0WZPDjlZfYcvjo0f21NQaDbiASvjwGsdQ cejHVHBySwNASf5WwNKKVrLh3KRqle36uNVbio7Xud7Uq/em7eTQoqfqSS4oTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732147527; 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=ySko/hqykwmMp1Q3TDY4LCZ5TnHgPX27dDFlUmUKMlc=; b=LadW2ltJZ4ukqm44G5B35/Um7Qv2CstaafAWcRnLWZBOSPg3WbF5hfYAVpAdkMzWhJOysY QbkeAr8TdGaqB/x5inj/cI3Xam2KtOlf67Gve3B37LA/peSogwD8qHQVsc33wB2hLwX+p7 raYiVlaXYX+sx//7DKcrg22QL9L7zDPLnCugr2MeylwUG2dkG/zhuMCuhXrqgcToMSnNDl VAJtjffD2P0asT4ciqPDxBQSM0Ad3MGJjpHJFPvFM3DsrBt6G5EnETXgxThEM54kx6Njv/ kCO8A3SVEDGC8ZrNfyeuxWM6mNyV1sobp5Cybf+N8SfYRqUqrxd9jxUpAvA45A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732147527; a=rsa-sha256; cv=none; b=cUn7BDf+04mMHhLZvgJFNxgQR7HQgDr9YxqPHkp6qLDXKRx+qYBnyURo/KeiUKAAlOmVUs bAxfTx5hDT8/R7F5uNv5UNEHjXsr4mgd9gjWZyTfLuCHMnUOjtCfJPrGyEG9sPVRrN3ICT N2qowtvXkLkpw6BGN1+p10PS77Vf181rvePCZd8KFAVXnZevjgIEZcjZ5Q2EuMShlQgjYa EcwNu1Yd0OEw/SqqiBmfJ+Y0HGemPT6Cmf/2y7/p/uR4Vq64wU2G443PEC9ytnPi3QlwI6 eTgwsH8DgHy4S8V8t1BaeQHOXnWvDcGBqwD272pmdiGJx481A41DB73Cg5ydMw== 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 4Xtz5L6kg4zGYD; Thu, 21 Nov 2024 00:05:26 +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 4AL05QU9087598; Thu, 21 Nov 2024 00:05:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AL05QQY087595; Thu, 21 Nov 2024 00:05:26 GMT (envelope-from git) Date: Thu, 21 Nov 2024 00:05:26 GMT Message-Id: <202411210005.4AL05QQY087595@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: b62012538e96 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: b62012538e967b22736e8c2214b222f21146bddc Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b62012538e967b22736e8c2214b222f21146bddc commit b62012538e967b22736e8c2214b222f21146bddc Author: Bjoern A. Zeeb AuthorDate: 2024-11-02 23:51:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-11-21 00:04:56 +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 Differential Revision: https://reviews.freebsd.org/D47407 (cherry picked from commit 7e2996c1f5b4e684cae40c2418b68061df9997d9) --- 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