From nobody Sat Sep 20 23:28:01 2025 X-Original-To: dev-commits-src-branches@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 4cTlss6VVlz68ZGv; Sat, 20 Sep 2025 23:28:01 +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 4cTlss3WNBz3gK7; Sat, 20 Sep 2025 23:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410881; 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=jdDeq5YPl4L9Lhz8NQTwLV9qPT/K05RBqKi4YAA7doo=; b=nfWLjKhl0bHSlSE3Tc4YEGd0X5v2Vpl79vLEVrjuCmYeLPMJiO9vX0e0HfF5fZWCrfnf4J 8P4sLkpD5SVjVE5zE+SIuleo06tdhyVHuYkZZufF1nJYwu4H26gCdBv4SUI3BDnq1VpSjZ uAktzv/rX4yKwjlKlVm2zTWoHwG4jhyRWqEsMVJZ+sl673reIcyXv9/8k0cq6aQZ1UxI5E V27hyPAGkYM0c8dbjihCwD76BrDLk2f275K7zoBPudYgS9P3htZpChBYbvhpt8z9uPPo9i xVLuB+boqbF8Y8lb31hSMxp7Iw8J6XCRMtSFfUlrjZThCObPoEolZmj01uJLZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410881; 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=jdDeq5YPl4L9Lhz8NQTwLV9qPT/K05RBqKi4YAA7doo=; b=nUnv1neH5GW+sIkw9cW6wcCwSAXWrPmOsni3/0wBya604lm2dSYzrQeX/Tv9YDwO+h6loN nJE2fhJxzzPanuAJ6ReUdC5XwdZJp2kMURFLuWCRbxKGypqBA8M8bg8R+czWSZqJYnrNvF 2snvhvUgmYOQn2x+SYMRKw8tWb3bwirkzzFFs1gt9x6G8UjDNulngS6O9XL1lTCP+Nuzmr 1LxprVQk5b3VHPABA7i2FykVVT/zylTK4Ewlk6n7ZFgM9pLCLS9DHltCf+e5BA68apstFg 0biiSkRiq6pq2PaP4W6H3bbUp4OmUf0xu6zrl7FAoP6V/bM6NXL/gwHS+qLquw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758410881; a=rsa-sha256; cv=none; b=NyTg+ZiCs6T/U6gKvpsJF0bA37Yf5R6mEH3oUYRYd2hTCByrnsm0lQq4BedKdxd2qbAVdY 9XBjzGALjgoNKjB3l/l0yS2k/O7GvwB5ulPqpoBbLIesimF5yf/M8h2JGvPI/Q/gOndLr/ hbqdgU5cyQ/ddefPUPoBj3aVrLf0/bOX9QC56aTeZVBZO6yvZJ2o/Bh3fgNsNPtcoHxeub cqPHYzK+45UJxhQ6rIEx66pPDwQS0/EHqGWS86dYZkKH5XX2FZ0oEcPyYYK+VDAInjgFbe xaiEVGbOyKg6hM1XMddOW91h3E47voOsV8vWNJjvjEktN2E39qotNz9NDQS58w== 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 4cTlss2bm1zqF7; Sat, 20 Sep 2025 23:28:01 +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 58KNS1Uu072917; Sat, 20 Sep 2025 23:28:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58KNS1Ko072914; Sat, 20 Sep 2025 23:28:01 GMT (envelope-from git) Date: Sat, 20 Sep 2025 23:28:01 GMT Message-Id: <202509202328.58KNS1Ko072914@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: 0a4eca324c11 - stable/15 - release: Make PKGBASE the default List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 0a4eca324c11d68dd7fc461ebf3a0a4cfd324761 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0a4eca324c11d68dd7fc461ebf3a0a4cfd324761 commit 0a4eca324c11d68dd7fc461ebf3a0a4cfd324761 Author: Colin Percival AuthorDate: 2025-09-15 00:37:20 +0000 Commit: Colin Percival CommitDate: 2025-09-20 13:50:55 +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 (cherry picked from commit 35b81af1eee699509bae2bbe12fdc770d9cee40a) --- release/Makefile | 12 ++++++------ release/release.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/release/Makefile b/release/Makefile index 7f4ae01fdc5c..7c3eb87c9938 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; \ @@ -301,7 +301,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 \ @@ -320,7 +320,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()