From nobody Fri Sep 19 16:29:13 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 4cSyd621Xxz68F98; Fri, 19 Sep 2025 16:29:14 +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 4cSyd61GjHz49lx; Fri, 19 Sep 2025 16:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758299354; 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=YIrjvAkqtuqJxyKUfmx1YqFXWlN2n4sSutstxWb6xRc=; b=o13OwPFRIW0CuJdABCo3YiQLBSBCj/+GzRgUvPsg3RSHQEm2rk7NEj2HReuNr3rYpk2seu S312JGkazPMU9XXlIbwJKiU+W4iAUptcVkvQtrE/kX89kmBJ96Hz3HVw1YVu5KTKR6S9VU erYtY1VR6uSmGaC9FqwP1Mp89k2/wDlaQeguogL3if2FvsmFU40IGsqn2TnUK8P/5avrko FOp19bNQSe933XfvuEMvPW4sJD0DPh8gxqTU+Y6oHJ0cHxnN6A7WvrGOIZBkrH1bsT5qB5 StAqeQM1fGpmV7TGzlz7cmFOhspOuVycFPOEXlUAjxQZOK6AXRtc3UPd5LXrxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758299354; 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=YIrjvAkqtuqJxyKUfmx1YqFXWlN2n4sSutstxWb6xRc=; b=dgPh8Sseep1JgJPGuEdOhNHXOUQ5VgsVTlCFP9G7KkpW73qtoa/2W8se1LQOBn5Cl1bANp gKz/tupS90/8OVD8odUmzbZC1ECF09p/Fbqm/+Hcr8unCwS2a88wJm+iWZBPC1LhGHT2S4 LA2XWUo1eQ7dF1uSxSIkoZeekw4GUd0/nFife3hEI9pirtIXvpK+f+CUNtaeQQx+oqINu1 J+zbnH38ZY+uqIfqzVMjDXmAOXvFT4RJPu377fT+S6q/ws3z5UwuxI1HMKo9PD4wbhdNM3 Q8k3ceoNUFuRBwR+I2WZSWBipQXLxEQJZ3OPj4H2BTcx9/ovrgDIxjqpasec8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758299354; a=rsa-sha256; cv=none; b=evM/qLj3yVW9KXQCcgAGwiHAxUeMXQf4buFyn747oQ8j5b2ISaYJNogfOwUPTnqfOc8L26 bduenTrlVuMKvwpzOdn1p+M1drm5XTbmM2W8u9oEgcMJJP4OUNqKXTPz53ZKdJZGHoPReE j4ARXptV7tEt0muXUp8kGtpKhT0kzNvQzClde1CP/DoBNb9c5n9qEAiQySISJCVksZFCow 4WplwECxmwtQWtZd2/v/AnzPzU7OJA/BBacm8dvkwFM40Msx6D393KWv8NI7+OQS39Dkqi VCGXg+NaTy7p8+8OM/Pgd0qRTLkyMhJC7dd/TiW3YgkOQtrUNGUskF6gsQ6RVQ== 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 4cSyd60kjwz14HQ; Fri, 19 Sep 2025 16:29:14 +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 58JGTDsc076369; Fri, 19 Sep 2025 16:29:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58JGTD0U076366; Fri, 19 Sep 2025 16:29:13 GMT (envelope-from git) Date: Fri, 19 Sep 2025 16:29:13 GMT Message-Id: <202509191629.58JGTD0U076366@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: 060f7edadcff - main - 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/main X-Git-Reftype: branch X-Git-Commit: 060f7edadcff77cf804b60ecb25f8517c8dca62f Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=060f7edadcff77cf804b60ecb25f8517c8dca62f commit 060f7edadcff77cf804b60ecb25f8517c8dca62f Author: Colin Percival AuthorDate: 2025-09-19 16:20:37 +0000 Commit: Colin Percival CommitDate: 2025-09-19 16:29:02 +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 --- 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 bc04a7974744..40eea0e24a70 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