upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

depend-cleanup.sh: Fix overzealous rescue.mk cleanup

Browse source 
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:		26a09db3ad ("Fix incremental build with WITH_NVME newly enabled")
MFC after:	1 week

(cherry picked from commit e546c3950a)
This commit is contained in:
Jessica Clarke 2024-09-10 17:33:06 +01:00
parent 9266d812ea
commit be778581eb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/build/depend-cleanup.sh
View file

@ -162,7 +162,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