git: 87c576a25a1f - stable/14 - release: rework distributions list

From: Ed Maste <>
Date: Mon, 01 Apr 2024 23:49:50 UTC
The branch stable/14 has been updated by emaste:


commit 87c576a25a1f79730843b20a843b69e3f21f77f6
Author:     Ed Maste <>
AuthorDate: 2024-01-22 14:49:02 +0000
Commit:     Ed Maste <>
CommitDate: 2024-04-01 23:49:25 +0000

    release: rework distributions list
    Components like base.txz and ports.txz are called distributions in the
    installer, and with the introduction of pkgbase we will start dealing
    with normal pkg packages in the installer.  Rename EXTRA_PACKAGES to
    DISTRIBUTIONS, and move base.txz and kernel.txz to that list.
    This introduces no functional change but is a small cleanup in advance
    of some pkgbase experimentation.
    Reviewed by:    cperciva
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:
    (cherry picked from commit 2e9b8c8c1e3938335e17e63049887f8e8c6e11bc)
 release/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 92d0106384a6..2cf6efe2e231 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -75,12 +75,12 @@ VOLUME_LABEL=	FreeBSD_Install
 NOPORTS= true
+DISTRIBUTIONS= base.txz kernel.txz
 .if !defined(NOPORTS)
-EXTRA_PACKAGES+= ports.txz
+DISTRIBUTIONS+= ports.txz
 .if !defined(NOSRC)
@@ -287,7 +287,7 @@ mini-memstick: mini-memstick.img
 mini-memstick.img: bootonly
 	cd bootonly && sh ${.CURDIR}/${TARGET}/ .${NO_ROOT:D/METALOG} ../${.TARGET}
-packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
+packagesystem: ${DISTRIBUTIONS}
 	sh ${.CURDIR}/scripts/ *.txz > MANIFEST
 	touch ${.TARGET}