The branch main has been updated by cperciva:
URL:
https://cgit.FreeBSD.org/src/commit/?id=cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6
commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6
Author: Colin Percival <cperc...@freebsd.org>
AuthorDate: 2024-11-05 21:35:17 +0000
Commit: Colin Percival <cperc...@freebsd.org>
CommitDate: 2024-11-05 21:39:38 +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.
Sponsored by: Amazon
MFC after: 2 days
---
release/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/Makefile b/release/Makefile
index 6f59647ff5db..9f19b150ae65 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -241,12 +241,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
