From nobody Thu Oct 2 11:46:38 2025 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 4ccql24Wsyz69g28; Thu, 02 Oct 2025 11:46:38 +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 4ccql23yDZz3nBF; Thu, 02 Oct 2025 11:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759405598; 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=az8IH4abe9bKG/+QDkO6vY3L02M2mq37HCGd/NgxErk=; b=bT0njJBTYBeZqwmzgkTh9YJZTxEmRmpL9b9CXhqMMtlbp9w/uELg10vTdzOIDb9ziCiOTy 6wGTm9MI0z8eSgViVCwRh99Zn4Lzi7er/G7Xlf2bSHM0hnpWtkmSRJAG8QDzA9XDkRBUjs slB4jNeODBnTyUdl/ja4V1z1/O0/urAXg9kCYjnnXZS4s1UrNHS+CqEpzTwjLm01+sX0W1 /WFNg2JTAlwzXXOIJ78VEKbyOBvW3VHD3m8MIsrWdD1lv1Nk8s2rUFVl5DUgNvQgVY1a+a EV4RTF9j5YAySZ/k7iLmLRnKH3urM+FLDH9qj/ldffhBUUSOo45QvWR7Uq28NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759405598; 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=az8IH4abe9bKG/+QDkO6vY3L02M2mq37HCGd/NgxErk=; b=LWf/boBC8LvVyVLAxi2q6Tf3XK9bxqj1ZLYpFyDL4lusJ0naQtLOe0XeDRSGPutFTVUktU wR43LD+4yDW/pCUreli2evdBhqAxhvcw2Fn4o1HpmHLD+9G0wNonjOLdpQ92+UBfm4RU71 D+DK70Otf/dY/4EQDzgj2jtAWAIczC7kyCZs1vLxSLW3FbWgxsGrD8k0bPcb1YSIjGkHsf D/No3rWtdoUHgjt5vE6ZIIVpVPdgSAA6Q2hR6s6pZiV4nJ+fBuS8G34XLLElPCX1JsDIcP 3QgtK+yhUhgyNrVjmAzTkzPUdlTjK2iKkkppVqyfe1/3/IUwbjg/A303e8DHFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759405598; a=rsa-sha256; cv=none; b=SwR4Slf3Ci29OLLp5k0AL1tbYWfWSzVfJhV+hE1/xRf366kMzQCNd3IfA9BtuiuGsSEpap byLq4eXi0OVvWPNo1f36FTl1KuUgv3nW0gMaU1IaV3v5LZgMNrhUIvIeDMpQnvmZ/JL9vZ A4S2EU8XzpnZqOuKMCEIr6diLv3d6ePKXFzeQvHBDEPlLWGZHcGfyO8ILxAyDlkOXql2u1 yhOV/5UN12qU/x+5aQOS/rvB5BOv4KULYZ+47tKmNqHYoqkRrPGcuK5lbl4S47pKRdhj4z SRIwxL0fruHkrkQerGzCNp8HgUtCH2KQA2cEch09U8YmtI44Z+Mdd3ZmtkJWWA== 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 4ccql23TKmz168W; Thu, 02 Oct 2025 11:46:38 +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 592BkcL2022449; Thu, 2 Oct 2025 11:46:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 592BkcEV022446; Thu, 2 Oct 2025 11:46:38 GMT (envelope-from git) Date: Thu, 2 Oct 2025 11:46:38 GMT Message-Id: <202510021146.592BkcEV022446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 3b9d89e1c90f - main - release: Install pkg(8) from the release repo on bootonly 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b9d89e1c90fd3b2667c07d5a0bfd300bf635bb3 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9d89e1c90fd3b2667c07d5a0bfd300bf635bb3 commit 3b9d89e1c90fd3b2667c07d5a0bfd300bf635bb3 Author: Lexi Winter AuthorDate: 2025-10-02 11:45:09 +0000 Commit: Lexi Winter CommitDate: 2025-10-02 11:46:26 +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 --- release/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 82617c1f4dd7..f907bf985893 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 @@ -278,7 +278,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 \ @@ -297,7 +297,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