From nobody Sat Sep 20 23:28:03 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 4cTlsw0G4tz68ZGy; Sat, 20 Sep 2025 23:28:04 +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 4cTlsv4tPzz3gMl; Sat, 20 Sep 2025 23:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410883; 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=ly4gazJBv9jJrtSx+WTqjsMakH6jWmMRuqzkDCEZzzE=; b=lwQpuHsHjOrlm8EtJ5amukt0EayPHtOs3P6CsiqDTLobOcj3nIi85KTQkkvGQ+vQ79vHX8 TBAsslaPCyIsNk1Qbzo2LfRhRAZ5s/drUs4T/BLwwZXikYzSrrB9OHJG7/2vEw1/Y70Qhv DMhUt9z8HfIUchU2vZmR29qA6EV5KCxBO91TDyC9nuGeO1nGYieU1EymB5nUOobji5mJe4 9RSe6VUw4qiVm2AUQIOznVEP9IyiMX4ny5LRDmAElBPMnoQ0eA6pSC0TKLAg5sFGxwIM9o vv8p31DGXREvAos/vaJhBMgXtbFTXT1BtKH8/K7yyTaajHwRY5/zLroA1XXDLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410883; 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=ly4gazJBv9jJrtSx+WTqjsMakH6jWmMRuqzkDCEZzzE=; b=Kl81N+ron+SBvxHehEnxeir71r/r9vFilxHZxb1sFau3i+2z8iOAleGe0YSHn9CsH09xuS 8mOrNZtneRdp+nqwzne+xsu4oz/CTZHhvz41RiLePzx8qUzYYuFbcaaGTS4oFzEtS8x6Hs oArV695a/AqnWU+3/0hN3DUD7+D3kC9EjsLmCJEgN5wxWgkzg/ghI7vI2vhXu8fGlZB3dA rmzp3TtiG4OuQERox+eBbL+JDCFFVS+eNGtJb5S2S7lIIj+ixYC3HMMKR4f7GJRK5kVc1p XqQcuEAdqeZ+1ETVO02QyZ/VKcV/kR11FzVGWfTbaPEuqBAjEY8R47h5D19Z/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758410883; a=rsa-sha256; cv=none; b=yIwFKcwWkQwYMlBq9Z3gjz9TVkmIoPOSFxL0MfVOOc9J8vAYHoZEoNkjL5PnRHbp5APIYe e1avtmbJ4qknpnUSD10UMW4ZG3/vRIHKW4HUkwdOGtBBuOxptjtYkVm8w6+PW6r5cZv4aQ c8dNT0JN1SPhkqIk8TjvEqbIBjI3jpcFPxdK1RAkEZ5dM6SKSxCjd2gxUQQJcXykFbjA8V R+Jc4Voccr8PyAy5ZUZO0dIPSgjX31BWWMpU2UGh1TPhEjmGIaKdvjesKuZfLdPUlfUjSX 9+Bs4KIUT2Hpl783qJMkGrqq52pEavSrF5mJ499wv7kxi/DRHTYpvwe9AueRnA== 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 4cTlsv4KYzzps0; Sat, 20 Sep 2025 23:28:03 +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 58KNS3Ck072995; Sat, 20 Sep 2025 23:28:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58KNS37x072992; Sat, 20 Sep 2025 23:28:03 GMT (envelope-from git) Date: Sat, 20 Sep 2025 23:28:03 GMT Message-Id: <202509202328.58KNS37x072992@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: 04ad9d737d2e - stable/15 - pkgbootstrap: Build pkg if PORTSDIR exists 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: 04ad9d737d2e097690cca92a892283e09bd04643 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=04ad9d737d2e097690cca92a892283e09bd04643 commit 04ad9d737d2e097690cca92a892283e09bd04643 Author: Colin Percival AuthorDate: 2025-09-18 19:21:29 +0000 Commit: Colin Percival CommitDate: 2025-09-20 13:50:56 +0000 pkgbootstrap: Build pkg if PORTSDIR exists If we don't already have the pkg tool installed, we need to install it before we can build packages for pkgbase. (This arises in release builds which run in clean chroots; most users will have pkg installed already.) Installing it from pkg.freebsd.org via "pkg bootstrap" runs into two problems: First, it's an external dependency with security implications; and second, there's a bootstrapping problem on new major versions where pkg.freebsd.org does not have packages yet. Instead, if we have a ports tree, use it to build pkg ourselves. With hat: re MFC after: 6 hours Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 2c06b824436df6177545cc0f1603e5c3bfbf3365) --- Makefile.inc1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index cd0385ea32ac..d41741d15384 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1992,8 +1992,16 @@ 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) + env - UNAME_r=${UNAME_r} PATH=$$PATH \ + make -C ${PORTSDIR}/ports-mgmt/pkg \ + I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=1 \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean +.else @env ASSUME_ALWAYS_YES=YES pkg bootstrap .endif +.endif PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}'