git: 7ca9dc8864de - stable/15 - release: Always dist sets on dvd1

The branch stable/15 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=7ca9dc8864de2ec9efa51a40631714d09bbdc2e7

commit 7ca9dc8864de2ec9efa51a40631714d09bbdc2e7
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-09-15 00:39:42 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-09-20 13:50:56 +0000

    release: Always dist sets on dvd1
    
    In the !NOPKGBASE && !NODISTSETS case, we only want the pkgbase repo
    on disc1; but we want both packaging formats on dvd in order to allow
    for offline installs in both methods and also tools which ingest the
    dist sets from the dvd image.
    
    MFC after:      12 hours
    Sponsored by:   https://www.patreon.com/cperciva
    Differential Revision:  https://reviews.freebsd.org/D52537
    
    (cherry picked from commit 7c0bc6c703eeaea737d0dbc21996764967e4dc97)
---
 release/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 7c3eb87c9938..50f69565a638 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -320,7 +320,6 @@ 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(NOPKGBASE) && !empty(NOPKGBASE)
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	for dist in $$(ls *.txz | grep -v container); do \
@@ -328,7 +327,6 @@ dvd: ${PKGBASE_REPO}
 	    echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
 	done
 .endif
-.endif
 .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
 # Install packages onto release media.
 	${PKG_INSTALL} pkg || true