From nobody Sat Sep 20 23:28: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 4cTlsz3nH5z68Z5s; Sat, 20 Sep 2025 23:28:07 +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 4cTlsz0ydfz3gCY; Sat, 20 Sep 2025 23:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410887; 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=gEnH2wsee1hD8W7KMv0FyS1dmC9vvOWiMwfcLpTki4k=; b=h+DbQXFHjlAFQfPZnEnvr0DJf++nfRR6GfUTkp2zwssctSzwXrhdq7S3V+qRYhpGEffIcw RlwgMVbsIXLiE4IUAU69LILqqHwq8CPIdh8M9TyAkoX/l41eMbibukmfAS2O1XOdWlodCo le5LVxBhtYPnKQD0h7pOSitsgdvtTpf6LgfPVCmI2iePeTuA8d/JE7sJgF8/QlhjFtXjRd gYSgbDppN4U1WXS9k2JQiz6+ETVlydBkDc5nvRDTiR++qpi67C/7hH0mVZrxh8PhFYV458 yvhIWPZ7D0TNZ4WacHSDXla/iYS99UESScNfBDCHAqWKls5avSJgRELtCaOTnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410887; 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=gEnH2wsee1hD8W7KMv0FyS1dmC9vvOWiMwfcLpTki4k=; b=HCICYa8sANCHOlAb+/5eEvuLes9QLIwp3TgKsIvvYZixvREYvWdlrapjC3BtZDFH2vIdDp 6ejNoSHbmP5+RQJZScPX3rBxArfB+cnwITNA/kAc0G9wxmJGQNOx+OpgJABvzolV/DgSQ+ 9X22pMMrkkmMQBILCic8wgi3ocKkDe9LLP4z+VBVvG6f8vyB3cvzF1TdS18xo0Wee0fIip rci+SucFR0kgAU5kK5z05NQRBhq+29acgsIRPf46BbiBavB+5z2g0TGaDKEcj7onvldbXw bIepCiRNsVYrHOJa/544Q1d7czrCDwi8PIomEKHDsdPx6f58noS91F7dfQYtEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758410887; a=rsa-sha256; cv=none; b=iOvcSsQzUr76n930DxaJJylVoqMZ0Jc8vlf+CROnnsaaPbQqihF4cd9fMDAlbi5Pa2DvMx hwJJZ9KqiMiypbuPajoRyt5ZsI2B7R0W2WNSPzd3SR4raWBtaXUkZ6l91Cks6HRYYnX9HE X4TmBq9MImrIqS64CP2X6zSdstv/71ntYFkawpfnts33//gB5j5RrQdZcbX8um8emfVJOb cQyrqtHZa3AZVVWJEQvgzKvtTov8B+wdcVWJoUCJvcrnGgDQSsUaHS2TRzokQmTXvbiEN/ 1oPRan7Nx8fUyPZ8RAckemn2Pwzs1eTBx1KP8FAQ3wS3/CVnzWyTEDlCvUY3qQ== 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 4cTlsz0S1dzqF8; Sat, 20 Sep 2025 23:28:07 +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 58KNS6pe073096; Sat, 20 Sep 2025 23:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58KNS6bP073093; Sat, 20 Sep 2025 23:28:06 GMT (envelope-from git) Date: Sat, 20 Sep 2025 23:28:06 GMT Message-Id: <202509202328.58KNS6bP073093@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: 42143eb1767a - stable/15 - pkgbase: Don't include pkg by default 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: 42143eb1767afc3e6114bcc352f3815c03044dc2 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=42143eb1767afc3e6114bcc352f3815c03044dc2 commit 42143eb1767afc3e6114bcc352f3815c03044dc2 Author: Colin Percival AuthorDate: 2025-09-19 16:20:37 +0000 Commit: Colin Percival CommitDate: 2025-09-20 13:50:56 +0000 pkgbase: Don't include pkg by default We need to put pkg into the pkgbase repository for release builds, but not for non-release pkgbase builds. Gate the contents of package-pkg behind INCLUDE_PKG_IN_PKGBASE_REPO=YES and set that when building releases. Reviewed by: ivy MFC after: 6 hours Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 060f7edadcff77cf804b60ecb25f8517c8dca62f) --- Makefile.inc1 | 2 ++ release/Makefile | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d41741d15384..65149beb9eb6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2047,6 +2047,7 @@ update-packages: .PHONY ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages package-pkg: _pkgbootstrap _repodir .PHONY +.if defined(INCLUDE_PKG_IN_PKGBASE_REPO) .if exists(${PORTSDIR}) rm -rf /tmp/ports.${TARGET} || : env ${WMAKEENV} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ @@ -2055,6 +2056,7 @@ package-pkg: _pkgbootstrap _repodir .PHONY OSVERSION="${SRCRELDATE}" \ sh ${.CURDIR}/release/scripts/make-pkg-package.sh .endif +.endif real-packages: stage-packages create-packages sign-packages .PHONY diff --git a/release/Makefile b/release/Makefile index 50f69565a638..3d1e2d44e4a8 100644 --- a/release/Makefile +++ b/release/Makefile @@ -195,7 +195,8 @@ PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI) pkgbase-repo: mkdir -p pkgbase-repo - ( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo ) + ( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo \ + INCLUDE_PKG_IN_PKGBASE_REPO=YES ) disc1: ${PKGBASE_REPO} # Install system