Skip to content

Commit

Permalink
build: Explicitly select debug files when distributing with -DNO_ROOT
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
patmaddox committed Dec 14, 2024
1 parent ac493db commit c4b5544
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,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
Expand All @@ -1577,7 +1577,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}; \
Expand Down

0 comments on commit c4b5544

Please sign in to comment.