From nobody Fri Oct 3 16:53:44 2025 X-Original-To: dev-commits-src-branches@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 4cdZVx5WBHz6BBmQ; Fri, 03 Oct 2025 16:53:45 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cdZVx102pz3HdC; Fri, 03 Oct 2025 16:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510425; 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=VzdGX3dL1seM3J75gm+3enU2btF2k5sIvLFRpzVCBqk=; b=bvLUs0PW7pZuzmq+H3r22KuVD78Wl24+b67gCd2Ww4vpWmraG51aQHDN01s1i2JCKChEHL L8tNZrc25B6Iu2Klf7ObOZ1rRW9q5ZypAnSr8qi95it/Oj7DR4dbeJvQofOwxXAJcFucbg 3yjZyGfVv9+1iMTRVE+Z7+e2Aa7zxYvMju/ABUVuyJ4IuOXTuRw9TVqmF6HIpH+/UAtPLg cJGwqVKlf6N2FOZ+/1SOEZltSndE6ekx79DXK09F3WSpqKbBxhb1AK0YjKeK7gQEAJRW+C cYKxI2vvZCwV/HNVaa8TJmSlC42LfkupyrONmkqdm0poUZoYkHbOPQT0ceKdeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510425; 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=VzdGX3dL1seM3J75gm+3enU2btF2k5sIvLFRpzVCBqk=; b=wHmIFXT4lvpt25RXhnKg10ZSzikDrHDSRZLkSuoCH16jssPWxZ3B0LvQe0EM2XJW1tXYJ7 vZYSdYVDLbz2Mod6QlIGGUWBgvWOIiqPEQgqTKHAdiYhpmtNWTwmLDL7SsfIPmcQ/A8xF8 WZWR/0AzIZtp0HMXof2HSZWpUAa3OHdv1XFTNhiy93xpdAaFdEj/e8knPIZ35JDifNzKop 0JZjJJGoK+PFkaNe1wszF5S3qqCvi58EU4XrlniNe72Dnum1/Y+gucpJv1icK5XsMIp0YK u/5FMjDNdGKw2Kjh+AL3cFbTPSNkFr8SamszZ0ATyMHU1WtAI2XDKikBiuidmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759510425; a=rsa-sha256; cv=none; b=cYRKl/lBfIglEjyEbB/WcHcZhLEgf1TmOHIDNTN0lEIwImFIW9RkMTIaUlVYHrD88MSRTW KhIuqNCAn/chW3cjSke+Yp0GVu9PRhSbrEkAwZQcZEmBxRpB5PH0TTkQz5ygGIdJPSwF5f Ipf4zoKETZUc28kPKJitZSXeL0Cjl1hnp4QrHKOQ9S47EQYllbu3/aX8H0v+2uy2UB3VPe bmpWr7Mlpstq5Z/wkr23JIrJtygn8e1lWSjSHiLR4KCKBD+hqJFc3L8/LK+W1Hk2ftwLFw ECUM8tCl/LT5Iap8WMg8gyrZwbQFudHositVoAMUwNi8W9M+I3VGLNrWUecYEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cdZVx0TJJz138l; Fri, 03 Oct 2025 16:53:45 +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 593GriSm064267; Fri, 3 Oct 2025 16:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593Gri8E064264; Fri, 3 Oct 2025 16:53:44 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:53:44 GMT Message-Id: <202510031653.593Gri8E064264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 779b8a20e4d0 - stable/15 - release: Install pkg(8) from the release repo on bootonly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 779b8a20e4d039433b5115773f664c6d56b1adf1 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=779b8a20e4d039433b5115773f664c6d56b1adf1 commit 779b8a20e4d039433b5115773f664c6d56b1adf1 Author: Lexi Winter AuthorDate: 2025-10-02 11:45:09 +0000 Commit: Colin Percival CommitDate: 2025-10-03 16:50:11 +0000 release: Install pkg(8) from the release repo on bootonly Although bootonly doesn't contain an offline package repository, we still want pkg installed so the user can use it to repair an existing system. Installing it from the release repository ensures it's always available without depending on pkg.freebsd.org. While here, fix a typo in PKGBASE_REPO_ARGS. MFC after: 3 seconds Reviewed by: cperciva Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52848 (cherry picked from commit 3b9d89e1c90fd3b2667c07d5a0bfd300bf635bb3) --- release/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 27a5d58c828d..169dc947c692 100644 --- a/release/Makefile +++ b/release/Makefile @@ -82,7 +82,7 @@ PKG_ENV+= ASSUME_ALWAYS_YES=yes PKG_ARGS+= -o METALOG=METALOG PKG_ARGS+= -r ${.TARGET} PKG_REPO_ARGS= -o REPOS_DIR=${.CURDIR}/pkg_repos -PKGBASE_REPO_ARGS=-o REPOS_DIR=${.OBJDIR}/pkgbase-repo-conf +PKGBASE_REPO_ARGS=-o REPOS_DIR=${.OBJDIR}/pkgbase-repo-dir # Pass -f to make sure pkg writes to the METALOG even if the package # is already installed from a previous build PKG_INSTALL= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} ${PKG_REPO_ARGS} install -f @@ -277,7 +277,7 @@ disc1: ${PKGBASE_REPO_DIR} echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG touch ${.TARGET} -bootonly: +bootonly: ${PKGBASE_REPO_DIR} # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ @@ -296,7 +296,12 @@ bootonly: echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) - ${PKG_INSTALL} pkg || true +.if !defined(NOPKGBASE) || empty(NOPKGBASE) + ${PKGBASE_INSTALL} pkg + ${PKGBASE_CLEAN} +.else + ${PKG_INSTALL} pkg +.endif ${PKG_INSTALL} wifi-firmware-iwlwifi-kmod wifi-firmware-rtw88-kmod || true ${PKG_CLEAN} || true .endif