From nobody Wed Nov 20 13:06:14 2024 X-Original-To: dev-commits-src-main@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 4XthSk74cbz5dkTn; Wed, 20 Nov 2024 13:06:14 +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 4XthSk6fC9z4vF7; Wed, 20 Nov 2024 13:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732107974; 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=p24XzQQJ8W2VYLaCyRZG+3b7vw0HaEhiUb1Xz3Ki9Rw=; b=ORiRoyBAqFEz3cHgjDsfuhI0zRwdVFtLx9RpWtf6lDtJStTA7RGW4VT21M0toL8Dwbi5Gd KFkP/hWsyvzdYd+0jL4XHHBddBbyVb79Duk7MnRjT871BMlJRrMseZUQMWlEw9+lgtVCLv 0XDz7YveMfEBl+htKfwW/GWGZ1Mic5uigKIXnsFeV0cLq0GnFvIjCGWK1U84LeDzUibBs/ BJK9lphV4mkbz/JUrilq2oVqajjVMv+yxDvcFj5VBLcQz9baF2eFlMcku7TcTFrrcFZZGT SzMLTSNpey+I9fn/SkzqtkWUZdJEPhxxfnZRQX/I25UGuFvx0iWvNtH+4yIhbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732107974; 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=p24XzQQJ8W2VYLaCyRZG+3b7vw0HaEhiUb1Xz3Ki9Rw=; b=CtqEjsvCXkCp2mdRTkESoUUWFoqb3nqloFQczAWgguc+4hOqsQcDsKnH2u3nd5TVbrrepW KGgamtzngaokF6xVB/lhXWgD59tzwCW+npd44PIlXY1jNi3HZ9nfLTUABFgIEtQvgcjE+M PwaY6jSR0U9Z9JWcDAX/EeCU6HVt4SBqBkcwZgJFrNPEVM3gHu+P1tva4mSBJ7utxj6f2W +Yg+ix2a5SlA170IOcnwq7BfxlpfrtRxhzy64Jlj6amAg0GADkXeoSIwM3DnWW5ZVO+l9B 5ENWq/Q5lQnujQZYZvi4BgE6Tws8ULF++2niYpJERSRcf/tzhXrq8NEta+NdqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732107974; a=rsa-sha256; cv=none; b=NHMLJOhVtuvv0BFJEVfWet6IyEZ9KTrx6DyHuUjhgDTVx4M+ePwD1ryZkkUsLfyJv+7wJy ta/w8IiNKsquqdRLymJuLv8fO3nSZjOO+cVuOZwbzQBWl3mioWffvpJM8aVLH/z2pAFYAB rntBoOB75CKXtnrasgftJqURyCJYCdT7Bslq+rV/yKOyXMpX5CEDbgnbiBjihYYuVI49Oq riDAlLccainVVsz0qPU4Mg8wFFaibeXfMb/0YLDgwJzroNv/+nnukdSyS8zWXphktBkABS 8tU53LnxK25hRbwwABxM2ZJvYyzQea/pk7m0zwE7BPFGALGx7/z5t990DnTVaw== 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 4XthSk6GS6zvrG; Wed, 20 Nov 2024 13:06:14 +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 4AKD6E3C061691; Wed, 20 Nov 2024 13:06:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AKD6Edo061688; Wed, 20 Nov 2024 13:06:14 GMT (envelope-from git) Date: Wed, 20 Nov 2024 13:06:14 GMT Message-Id: <202411201306.4AKD6Edo061688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7e2996c1f5b4 - main - release: install wireless firmware onto disc1 and dvd List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7e2996c1f5b4e684cae40c2418b68061df9997d9 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7e2996c1f5b4e684cae40c2418b68061df9997d9 commit 7e2996c1f5b4e684cae40c2418b68061df9997d9 Author: Bjoern A. Zeeb AuthorDate: 2024-11-02 23:51:07 +0000 Commit: Bjoern A. Zeeb 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