Date: Tue, 10 Sep 2024 16:36:31 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e546c3950a2c - main - depend-cleanup.sh: Fix overzealous rescue.mk cleanup Message-ID: <202409101636.48AGaVN4050675@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e546c3950a2c98b298b8ddfb68b50cb496fe7fac commit e546c3950a2c98b298b8ddfb68b50cb496fe7fac Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2024-09-10 16:33:06 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2024-09-10 16:33:06 +0000 depend-cleanup.sh: Fix overzealous rescue.mk cleanup grep -q -v means "are there any lines that don't match", not "are there no lines that match", and since the file has lines other than ones with nvme_util.o when up-to-date this triggers on every build. Fixes: 26a09db3add3 ("Fix incremental build with WITH_NVME newly enabled") MFC after: 1 week --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 2ae5a8c77448..828586e9d231 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -178,7 +178,7 @@ fi # 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ - grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then + ! grep -q 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then echo "removing rescue.mk without nvme_util.o" run rm -f "$OBJTOP"/rescue/rescue/rescue.mk fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409101636.48AGaVN4050675>