git: 35b81af1eee6 - main - release: Make PKGBASE the default

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=35b81af1eee699509bae2bbe12fdc770d9cee40a

commit 35b81af1eee699509bae2bbe12fdc770d9cee40a
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-09-15 00:37:20 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
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 <arch>/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()