git: c5fc8587ab14 - releng/14.2 - release: Include -dbg files in dvd image

The branch releng/14.2 has been updated by cperciva:

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

commit c5fc8587ab142dcb90324b83d25eaab68b410c58
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-11-05 21:35:17 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-11-07 02:53:58 +0000

    release: Include -dbg files in dvd image
    
    In 2016, commit 8834318685bc reworked the code for excluding -dbg
    files from install media, and in the process accidentally broke it
    for dvd images ('grep -v' should have been 'grep -vE').
    
    FreeBSD Update builds later began to depend on this, and in any case
    since DVD images are intended as "include everything" images there's
    no point excluding those; so remove the (broken) filtering from DVD
    image builds.
    
    Approved by:    re (implicit, release build fixes)
    Sponsored by:   Amazon
    MFC after:      2 days
    
    (cherry picked from commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6)
    (cherry picked from commit ba7844e4c91505e397396ab981a0032699b0cd70)
---
 release/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 9ca32e168fe7..3ae3a28a1104 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -245,12 +245,12 @@ dvd: packagesystem
 		-DDB_FROM_SRC )
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
-	for dist in MANIFEST $$(ls *.txz | grep -v -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \
+	for dist in MANIFEST $$(ls *.txz); \
 	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
 	done
 .if defined(NO_ROOT)
 	echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG
-	for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \
+	for dist in MANIFEST $$(ls *.txz); \
 	    do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
 	done
 .endif