Date: Tue, 31 Mar 2026 15:59:08 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev <tembun@bk.ru> Subject: git: 560f75dc844f - stable/15 - OptionalObsoleteFiles: Don't mark /usr/lib/debug/boot directory obsolete Message-ID: <69cbef4c.3a216.7b88c3f9@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=560f75dc844f8a0cb39d168d2679cd6c72a88ddf commit 560f75dc844f8a0cb39d168d2679cd6c72a88ddf Author: Artem Bunichev <tembun@bk.ru> AuthorDate: 2026-02-19 19:09:48 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-03-31 15:57:29 +0000 OptionalObsoleteFiles: Don't mark /usr/lib/debug/boot directory obsolete The intent of the currect code is to ignore anything under /usr/lib/debug/boot/*. But we also should make sure that /usr/lib/debug/boot directory is also ignored and is not marked obsolete. If we don't do that, `make DBATCH_DELETE_OLD_FILES delete-old` will try to rmdir(1) this directory, which will cause an error, since /usr/lib/debug/boot may have nested directories like kernel/ and modules/. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55077 (cherry picked from commit c8191c3d613928d8bd6060aa2f7da349b4090cc1) --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b0d80ab26211..bea969b77457 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1443,8 +1443,8 @@ OLD_DIRS+=usr/include/fs/cuse .if ${MK_DEBUG_FILES} == no .if exists(${DESTDIR}/usr/lib/debug) -DEBUG_DIRS!=find ${DESTDIR}/usr/lib/debug -mindepth 1 \ - -type d \! -path "${DESTDIR}/usr/lib/debug/boot/*" \ +DEBUG_DIRS!=find -E ${DESTDIR}/usr/lib/debug -mindepth 1 \ + -type d \! -regex "${DESTDIR}/usr/lib/debug/boot(/.*)?" \ | sed -e 's,^${DESTDIR}/,,'; echo DEBUG_FILES!=find ${DESTDIR}/usr/lib/debug \ \! -type d \! -path "${DESTDIR}/usr/lib/debug/boot/*" \! -name "lib*.so*" \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cbef4c.3a216.7b88c3f9>