git: 2e9b8c8c1e39 - main - release: rework distributions list

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=2e9b8c8c1e3938335e17e63049887f8e8c6e11bc

commit 2e9b8c8c1e3938335e17e63049887f8e8c6e11bc
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-01-22 14:49:02 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-01-24 14:13:51 +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:  https://reviews.freebsd.org/D43544
---
 release/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 3af7825c2684..3bfdde407cec 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -75,12 +75,12 @@ VOLUME_LABEL=	FreeBSD_Install
 NOPORTS= true
 .endif
 
-EXTRA_PACKAGES=
+DISTRIBUTIONS= base.txz kernel.txz
 .if !defined(NOPORTS)
-EXTRA_PACKAGES+= ports.txz
+DISTRIBUTIONS+= ports.txz
 .endif
 .if !defined(NOSRC)
-EXTRA_PACKAGES+= src.txz
+DISTRIBUTIONS+= src.txz
 .endif
 
 RELEASE_TARGETS= ftp
@@ -284,7 +284,7 @@ mini-memstick: mini-memstick.img
 mini-memstick.img: bootonly
 	cd bootonly && sh ${.CURDIR}/${TARGET}/make-memstick.sh .${NO_ROOT:D/METALOG} ../${.TARGET}
 
-packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
+packagesystem: ${DISTRIBUTIONS}
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
 	touch ${.TARGET}