From nobody Fri Sep 19 17:08:06 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 4cSzTy6bqZz68HcZ; Fri, 19 Sep 2025 17:08:06 +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 4cSzTy5r6fz4K3S; Fri, 19 Sep 2025 17:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758301686; 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=YVcl18gY94ShgVneaxXE0MkDR/0CkWDeBM9W68l6yUA=; b=Mmq4mCxn2+BiS9Mw47dFcvm1CED+tj2G4fKt2/SSf1nQH1URpqr4OwgWILPgxHXn2zmd11 EwIlnp9ruvW2+/Qo8o+uhMiyPXPcl5bCUwtzr2p6/aD3J5sNQiRb/unmfBP7SOTViHe7lO 3q9q2/yzszaOATlz5uV2fnH1KQp7se9L/UFUpkPfx4Szv+pbTY5b+IanBDHjZJWtdgtdLo 9T6tPVXNyYqs9s1X4+K+JkixPBzDP/xz4ZmybqM9b5wQ+ncxmgEEWQs/0GauFsAFeqvZsJ kWR6WbAkzeVATeYUDvLvJecLMmyduhV1iwy3Ez4fFSZNhH2DzhlJA7Qzo0OVJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758301686; 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=YVcl18gY94ShgVneaxXE0MkDR/0CkWDeBM9W68l6yUA=; b=NAOdhLakzj8QPpjJT6uFWy/r2MzM/0iVLS8UyiNdfq5Huzn7oTWELHOgGAM3of7d41C8Dc yOK8aA6xGAFnB6tTHWgahilzhfca0N4tt6148pMKY8xYMmRUYqKVN5f/pm1sYYwhKUoPcK Q/E9ABbsAo2tARAL3UG34am2m6GagEFCW4OyzJM+QPmp9yVweGZz4mmIuYsxpDAwxSp+kd 7sGkn4WGndUfEN1dtGkqrC2fNG1aGWDkn6QXzvoDllNV5RiWbLS6eG5w2kt6dzLjpky//2 Q00qL8zk198mlPKLU0+QBUDJhRwSX+JP3g+9fI2kplihd3KNusd6Yo6WIH5VVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758301686; a=rsa-sha256; cv=none; b=dT764pQd2CaYHyi9d8RTslUhu1vmQmV4hfQuFeptRZVdnCYm8olEshI4kSp7ruB53JvQiS R1YCMHSQBo+aSN8Gk6isQ/zPyPYGPio8I9IrYxKLlFwNBjcRKiUHUzKRO6u+ID19Z/NTdZ /EH37As3FKKrA3ilZ9yVBsu/TzGgBO49Sk5AQ0CNsDL+1etwHRixV05KXx5YuBNPmieFVo HxE/1rD1mFjGUnFFp5LojE8tYMZnLpuBKekKILUbjgp+zaknOqlMyX6xlw/qhUujdGQHvX BTghUIZ2qFA0H59dFh6OgezDeRW6FnmxosfJiIKlYVHaMogmudIN1uHliBt/JA== 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 4cSzTy5Cktz15QJ; Fri, 19 Sep 2025 17:08:06 +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 58JH86sT052294; Fri, 19 Sep 2025 17:08:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58JH86mh052291; Fri, 19 Sep 2025 17:08:06 GMT (envelope-from git) Date: Fri, 19 Sep 2025 17:08:06 GMT Message-Id: <202509191708.58JH86mh052291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e87b75a8bfc8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: e87b75a8bfc8fb7fda8225e55255d9ad99cdefb2 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e87b75a8bfc8fb7fda8225e55255d9ad99cdefb2 commit e87b75a8bfc8fb7fda8225e55255d9ad99cdefb2 Author: Colin Percival AuthorDate: 2025-09-19 16:46:21 +0000 Commit: Colin Percival CommitDate: 2025-09-19 17:07:33 +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") --- 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 40eea0e24a70..b4da9c68eca1 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