From nobody Thu Sep 18 04:41:54 2025 X-Original-To: dev-commits-src-main@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 4cS2zQ4ttWz67hXl; Thu, 18 Sep 2025 04:41:54 +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 4cS2zQ2yfVz3HP6; Thu, 18 Sep 2025 04:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758170514; 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=rdo6+ON5x8DLNrBWDRzfLmheYxQxKtm7roD6CL4OuKc=; b=Pi2Ytype2/Tlb5LscwrZn8SG5sv9jpFdYBQRuaWUGdykDUo8Sbkj1cmlblPtw+pW7LRhXR MtyLHhHvMXjCP0232s54y/7/3/M52S1tuAa9pEpwD8KDybWXHGeuxXz57ox5UfqmgNaDBC I/ii2Iw/ibAfTLQbaHxGs0k7leEWboPze2tW0reiM7V/4+cssjl/z/qSF0oKf7K9sXGbDj Vu4mRTzqgI9q7yEOI1d5ZF0F3EQeHhKHaDpvUhDk/5OjIf3WntnSfLsIBLWcc3QzWaDTUS pYG/ordrtyVWIqe0NCxAEwm0TWhWSnn+Q/4iJhO/vbM/7JhQqMZA30Wid4eqfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758170514; 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=rdo6+ON5x8DLNrBWDRzfLmheYxQxKtm7roD6CL4OuKc=; b=Yv0EHDBRyEN2ap9AuvAHgzcwlUFlvRYRR/difPo3X7uq6BCA5I2TKADbIq5JoRaiIZcweU R0/fQo5DasKb95sWyfTDwzyhLZBZbp6vOJqyUbaqB8Ed1UoHdxfIaSPNyzuV7kF42v+Jq4 goCfGAl5dpeMK/ysZEPC2k/aR+O0Ny1GTPX7DeXxuW7x2QqiILMFlQqHgXfvbMYn4NaD2y cqDoe89+5LbcQfWhd9MC99uaIJcPeICGxEO2jRBwJYdEaT56kKjkywRWWT0K5h38WIiWdy g0WTWXCXg86I+TcnrrSbnH3AMM3uCPcAV7E5hWmXS5I6L14TnT/kxQ9YZ1nYJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758170514; a=rsa-sha256; cv=none; b=Tv1qnB4tL/OqbeI/oRwq218KaOwcY+YV/XclZaUkJy6CucPM9F8Fq4HwEgj1rB0OZvfwT+ ON2PeK+Pdro5jnHTzNbM2vFKu2A14zRMvkMl9CXlgvzqIYSPVdPIElpj1Ss+MJXy0kVwVI sKm0LAPXgi95TsLZvJ2cEZPuP2sbS37nLv4TwoFNQuQxvBWqSlfx98r+GtYC2JZ9DhsTGY go2tVHkLxHqYH2z1voIrpSFKXDuadQU+O59Y+R/BS5JIl3oPF6CPROrQNyr1NAG1fKIMkW JR+gLOvdmmgDOMubKk7Og3AG7JzYKP3nild8GM2bDsHqn99Tu2AFGfm4LQ8qKQ== 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 4cS2zQ2V2DzwNp; Thu, 18 Sep 2025 04:41:54 +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 58I4fsPv045795; Thu, 18 Sep 2025 04:41:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I4fsxH045792; Thu, 18 Sep 2025 04:41:54 GMT (envelope-from git) Date: Thu, 18 Sep 2025 04:41:54 GMT Message-Id: <202509180441.58I4fsxH045792@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: 35b81af1eee6 - main - release: Make PKGBASE the default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 35b81af1eee699509bae2bbe12fdc770d9cee40a Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=35b81af1eee699509bae2bbe12fdc770d9cee40a commit 35b81af1eee699509bae2bbe12fdc770d9cee40a Author: Colin Percival AuthorDate: 2025-09-15 00:37:20 +0000 Commit: Colin Percival CommitDate: 2025-09-18 04:40:48 +0000 release: Make PKGBASE the default Replace the PKGBASE option by a NOPKGBASE option. Check for both whether the option is defined and whether it is empty, since when running from release.sh we always define NOPKGBASE. MFC after: 12 hours Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52536 --- release/Makefile | 12 ++++++------ release/release.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/release/Makefile b/release/Makefile index 41bca6dceebc..e48527de160d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -22,7 +22,7 @@ # WORLDDIR: location of src tree -- must have built world and default kernel # (by default, the directory above this one) # NODISTSETS: if set, do not include dist sets or MANIFEST -# PKGBASE: if set, include pkgbase packages rather than dist tarballs in +# NOPKGBASE: if set, include dist tarballs rather than pkgbase packages in # disc1 and dvd1 installation media # PORTSDIR: location of ports tree to distribute (default: /usr/ports) # XTRADIR: xtra-bits-dir argument for /mkisoimages.sh @@ -188,7 +188,7 @@ bootonly: packagesystem dvd: packagesystem .endif -.if defined(PKGBASE) +.if !defined(NOPKGBASE) || empty(NOPKGBASE) PKGBASE_REPO= pkgbase-repo PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI) .endif @@ -207,7 +207,7 @@ disc1: ${PKGBASE_REPO} MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no) -.if defined(PKGBASE) +.if !defined(NOPKGBASE) || empty(NOPKGBASE) # Create offline pkgbase repo on release media mkdir -p ${.TARGET}/usr/freebsd-packages/repos/ ${.CURDIR}/scripts/pkgbase-stage.lua disc \ @@ -226,7 +226,7 @@ disc1: ${PKGBASE_REPO} echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.if !defined(PKGBASE) +.if defined(NOPKGBASE) && !empty(NOPKGBASE) # Copy distfiles for dist in $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); do \ cp $${dist} ${.TARGET}/usr/freebsd-dist; \ @@ -303,7 +303,7 @@ dvd: ${PKGBASE_REPO} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \ MK_TESTS=no MK_DEBUG_FILES=no) -.if defined(PKGBASE) +.if !defined(NOPKGBASE) || empty(NOPKGBASE) # Create offline pkgbase repo on release media mkdir -p ${.TARGET}/usr/freebsd-packages/repos/ ${.CURDIR}/scripts/pkgbase-stage.lua dvd \ @@ -322,7 +322,7 @@ dvd: ${PKGBASE_REPO} echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.if !defined(PKGBASE) +.if defined(NOPKGBASE) && !empty(NOPKGBASE) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist for dist in $$(ls *.txz | grep -v container); do \ diff --git a/release/release.sh b/release/release.sh index eed02f0f36d3..f4786685e612 100755 --- a/release/release.sh +++ b/release/release.sh @@ -199,7 +199,7 @@ env_check() { KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCPORTS} \ WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ WITH_CLOUDWARE=${WITH_CLOUDWARE} WITH_OCIIMAGES=${WITH_OCIIMAGES} \ - XZ_THREADS=${XZ_THREADS} PKGBASE=${PKGBASE}" + XZ_THREADS=${XZ_THREADS} NOPKGBASE=${NOPKGBASE}" return 0 } # env_check()