From nobody Fri Apr 25 14:12:12 2025 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 4ZkZXs3H6Cz5tbvN; Fri, 25 Apr 2025 14:12:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZkZXr6bZCz41ch; Fri, 25 Apr 2025 14:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745590332; 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=gld2jK++cVJch2MMXItA8uTZO0ON2LTsSopAseARyI0=; b=RQNvdEVS3Jut5APnKk/sppW8gqtLVS/xbPxwtuhQBSVGQ/efGlSml4tgwg/tG0Yo5b8uzP PrymdgyR+ykQHb3whC+zfNumkXpsqcKmyNoGZWXD9mE/i12kRLPABAvIt1rr/G8Vtoo9ji CXExA/e838ZdZfkZu2adTyNTWJ+W97J2b9F7zC6iBqgOyPzBi+pfOPX+xVcgd9MYdEVPuK k9tSYQfI/UZ6CO29p1U9o5aV9v44IJtqLW8pVUOQTdV3tLIrqqiK2ceSBL9eh+tSuCvcNF Wgj5+s/XZS0daHZnQv3fycyCAKct8lc5rqLTcu7EelT2JGxNvBjANSYVg3RJ/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745590332; a=rsa-sha256; cv=none; b=rxAl3ADNnPF1W7zBqnd2MBdhf0XuGeZeZyMCIbyDpj206GWM7Bz4cyjLW9Bf8vkC6IUqRU pHJ9jgROmlg9zah16ScLPUZ9qAxA6E4/75kboouIkgiYdVdIme3/ca7mjLQkXr62P7WEEg k9Lh8Wz8Uahm6XmDZcxGdfIq/HQ+xnOf+UxWuRr8b85wXVO2AytaLfMk9drQ+Ic7JEc5hQ g7c0OAZZOGv29jFVv+OSvnioWkuDdZCQ71XniR6T3MqAH99NgzxU+OAT5c4S+P4viQCPvf V5yNLp2r+YuO6UHFORRx4fm1zYC7d9MU5NNaekoxb7MHHnDf4MWZfJW5jlO0OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745590332; 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=gld2jK++cVJch2MMXItA8uTZO0ON2LTsSopAseARyI0=; b=fGl0dkQXPDMPx1di+xzXPw+ymHTFn/XtatevK8FDrkeYVIa6ZGyn5CzLna4S3FJWvVYMVU 2+kJ3bxjzpdvVZbjO0NebV6cqXRDxAy+ztKIARzRAUZsChq7OMcZ6Oq/wDM5v2vZUjGfqt wy4IVTK+8lQCJIYh519l31fSnPxPm6x4zKekLfXO/FcebQfok2YJH8D+HtQKrNKcIgkXeT TaF2XIaHede3jbKdEUpvyUJCqAZeflrm2RsjRSJ9QMAy4ze75UgsPOmuYZ8+bDgyRhylJc eckzQyZ5a3DqfbEM/mEQyitp3YGcQ1Rz7n8zC6GIuvagq+jEUY/OIgeI5R10ww== 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 4ZkZXr5wYDzf4m; Fri, 25 Apr 2025 14:12:12 +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 53PECCwn032016; Fri, 25 Apr 2025 14:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53PECCQS032002; Fri, 25 Apr 2025 14:12:12 GMT (envelope-from git) Date: Fri, 25 Apr 2025 14:12:12 GMT Message-Id: <202504251412.53PECCQS032002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 92e9301e56bd - main - release: install pkg to install media 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92e9301e56bdd32dedd461c66745b5d453390cf2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=92e9301e56bdd32dedd461c66745b5d453390cf2 commit 92e9301e56bdd32dedd461c66745b5d453390cf2 Author: Isaac Freund AuthorDate: 2025-04-23 07:18:48 +0000 Commit: Ed Maste CommitDate: 2025-04-25 14:11:50 +0000 release: install pkg to install media This is the most straightforward way to make installation of base system packages from install media possible. Bootstrapping pkg at install time does not work since the root filesystem of install media is immutable. Reviewed by: bz, cperciva, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49968 --- release/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release/Makefile b/release/Makefile index d908059d781b..65a39d500f0b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -193,6 +193,7 @@ disc1: packagesystem .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. + ${PKG_INSTALL} pkg || true ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif @@ -231,6 +232,11 @@ bootonly: packagesystem cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG +.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) +# Install packages onto release media. + ${PKG_INSTALL} pkg || true + ${PKG_CLEAN} || true +.endif # Set up installation environment ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf @@ -266,6 +272,7 @@ dvd: packagesystem .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. + ${PKG_INSTALL} pkg || true ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif