From 5542e702f7aab720eb89ca8cfc9dc05dd90dd18a Mon Sep 17 00:00:00 2001 From: Pat Maddox Date: Sat, 14 Dec 2024 08:39:22 -0800 Subject: [PATCH] build: Explicitly select debug files when distributing with -DNO_ROOT Most of the debug files live in usr/lib/debug, but usr/tests/sys/vm/stack/.debug/libsoxstack.so.debug does not and was incorrectly being included in base.txz. PR: 283214 Signed-off-by: Pat Maddox --- Makefile.inc1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 755a49105ff9a..124d90f9316a3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1565,7 +1565,7 @@ packageworld: .PHONY .for dist in base ${EXTRA_DISTRIBUTIONS} .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - ${TAR_CMD} cvf - --exclude usr/lib/debug \ + ${TAR_CMD} cvf - --exclude usr/lib/debug --exclude '*.debug' \ @${DESTDIR}/${DISTDIR}/${dist}.meta | \ ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz .else @@ -1578,7 +1578,8 @@ packageworld: .PHONY .for dist in ${DEBUG_DISTRIBUTIONS} . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - ${TAR_CMD} cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ + ${TAR_CMD} cvf - --include usr/lib/debug --include '*.debug' \ + @${DESTDIR}/${DISTDIR}/${dist}.meta | \ ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \