From nobody Sat Sep 20 23:28:08 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 4cTlt05rbhz68ZH2; Sat, 20 Sep 2025 23:28:08 +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 4cTlt01wdQz3gP4; Sat, 20 Sep 2025 23:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410888; 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=TcXUhtmGzOpCOBZZSwB6/hBNqbNCeyizLba+O5HH/2c=; b=LpwZP6I9g/WPew9spTyBve2yWI2CST9eShfuHhl0I9iD5h/SL8v8KNtveTzntYtxs7o31m GhaLsTEGi5iaXsZOM6h16IbEDlcbxkwWgoyWZrRekniyyBmNam28vpgVxFdDdsn6r5nIDG elfWO3g+LBBK5mp9x21Yx6MssCUtBWffg5cJR7Tb2taRvmh9SdP4SHCT4C0nGCJVHwqhXa fzMeFcWpVKY7l9cp6v9eV+FKgtFxDJ/wd2sQuE3HoTZNgOBOsX13DJgzMI9t/wr/YP4x1L FlWjLalSBzmPHx1122f8+2Do40vWis5abjshLduxg4TNE88bVLcz9UxzgD+BVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410888; 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=TcXUhtmGzOpCOBZZSwB6/hBNqbNCeyizLba+O5HH/2c=; b=OEX/rjHH7n6qYUwO5NW+KsDApcOD4R1803d8EYOEA0CDRxv+MAiqvBxKrtzRPJ4sjf/tJZ tILR1MW5J5ckELVN0BvdFpQcvukB5UOziJTl6nEhk5/hUrxTDmOakermEyJFNIlGOrCp+E Vnal5VFFFwkKtUugVnOpv/8WTXiOdA6XDqrxGwwEuLvu5fgp6JEpD5GiGjZjiN4nu0DWBC xEcjBCLanh3zRp6X2la/dkdCnUsVRo6yEHOUKy+saJhrL33DuOnNvFU2q7EGZLIF4A8Tqy KX0g4W1al372qBmtV2O96xRU5aYLgvbDfjuUJJOrfNWdN2CNcPnyZ26v+ZMx6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758410888; a=rsa-sha256; cv=none; b=Rr+hkvUFNQdGB1r7RXPG2GMhwI7hMKr10adDHbBq7Lekb47NoTj7b7E1xWDv8EXVvfQ5rx PdgmnFuSRVbK1t8gU+nOT61qLfzugRJ0KvvSrM5YWHPfeT7TOvAqtQSXHIebJKcjbNMf9z ZGqJ9rjCdoYCbVTj9auGRcW5ADdSn/C+rDOxlyP7avWz8At0Xa4yqd6tpDQKin4eSbcT6Z 5cHSgYw73s1hh/+k5fwIfu12P3xlgliZLYoTLZUFzs2nWNvuyR1xho72QlboICISLz+Vqf l34KUQg4zqDIHqJGW6MmXjH3tmeorLba08PGk75B1Kr9SAmI9WDIg1mrCW5Ifw== 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 4cTlt01Qf9zqF9; Sat, 20 Sep 2025 23:28:08 +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 58KNS8tT073129; Sat, 20 Sep 2025 23:28:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58KNS88s073126; Sat, 20 Sep 2025 23:28:08 GMT (envelope-from git) Date: Sat, 20 Sep 2025 23:28:08 GMT Message-Id: <202509202328.58KNS88s073126@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: 91970dfbaf29 - stable/15 - pkgbootstrap: Gate building from ports 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 91970dfbaf29ec4902f95a346ffe6c14e4498b01 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=91970dfbaf29ec4902f95a346ffe6c14e4498b01 commit 91970dfbaf29ec4902f95a346ffe6c14e4498b01 Author: Colin Percival AuthorDate: 2025-09-19 16:46:21 +0000 Commit: Colin Percival CommitDate: 2025-09-20 13:50:56 +0000 pkgbootstrap: Gate building from ports In release builds we want to build pkg from the ports tree for reasons mentioned in a previous commit; but non-release pkgbase builds may be just fine with installing pkg from pkg.freebsd.org. Gate it behind BOOTSTRAP_PKG_FROM_PORTS rather than building form ports any time we have a ports tree available. While I'm here, make the pkgbase-repo target in release/Makefile create the temporary directories we need for building. Reviewed by: ivy MFC after: 6 hours Sponsored by: https://www.patreon.com/cperciva Fixes: 2c06b824436d ("pkgbootstrap: Build pkg if PORTSDIR exists") (cherry picked from commit e87b75a8bfc8fb7fda8225e55255d9ad99cdefb2) --- Makefile.inc1 | 2 +- release/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 65149beb9eb6..6744a25965c6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1992,7 +1992,7 @@ PKG_ABI!= ${PKG_CMD} -o ABI_FILE=${PKG_ABI_FILE} config ABI _pkgbootstrap: .PHONY .if make(*package*) && !exists(${LOCALBASE}/sbin/pkg) -.if exists(${PORTSDIR}/ports-mgmt/pkg/Makefile) +.if defined(BOOTSTRAP_PKG_FROM_PORTS) env - UNAME_r=${UNAME_r} PATH=$$PATH \ make -C ${PORTSDIR}/ports-mgmt/pkg \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=1 \ diff --git a/release/Makefile b/release/Makefile index 3d1e2d44e4a8..35eae4083d14 100644 --- a/release/Makefile +++ b/release/Makefile @@ -195,8 +195,9 @@ PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI) pkgbase-repo: mkdir -p pkgbase-repo + mkdir -p /tmp/ports /tmp/distfiles ( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo \ - INCLUDE_PKG_IN_PKGBASE_REPO=YES ) + INCLUDE_PKG_IN_PKGBASE_REPO=YES BOOTSTRAP_PKG_FROM_PORTS=YES ) disc1: ${PKGBASE_REPO} # Install system