diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2024-09-10 16:33:06 +0000 |
|---|---|---|
| committer | Jessica Clarke <jrtc27@FreeBSD.org> | 2024-09-10 16:33:06 +0000 |
| commit | e546c3950a2c98b298b8ddfb68b50cb496fe7fac (patch) | |
| tree | 00e0b18742e5e1cfad02e40ebd1e4bc2c2528b3b /tools | |
| parent | 7ce171bd4220b2e8946556bb806c787b51324993 (diff) | |
| download | src-e546c3950a2c98b298b8ddfb68b50cb496fe7fac.tar.gz src-e546c3950a2c98b298b8ddfb68b50cb496fe7fac.zip | |
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build/depend-cleanup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |