git: 0980d0a0376f - main - depend-cleanup.sh: Fix overzealous abd_os.c cleanup
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 10 Sep 2024 17:55:03 UTC
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=0980d0a0376fc73cbaeda9f0713cfb84c881bc2c
commit 0980d0a0376fc73cbaeda9f0713cfb84c881bc2c
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-09-10 17:54:45 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-09-10 17:54:45 +0000
depend-cleanup.sh: Fix overzealous abd_os.c cleanup
A source file with the same name is still used to build an abd_os.o, it
just comes from a different directory. Thus we need to include part of
the path in the regex too. Technically zfs/abd_os\.c would suffice given
it's now in sys/contrib/openzfs/lib/libzpool/abd_os.c, but this seems
clearer and less likely to have future false-positives.
Fixes: fd3d3240b0d7 ("depend-cleanup.sh: Add a rule to work around abd_os.c dependency changes")
---
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 cb2551fced78..b3608e46b65d 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -185,4 +185,4 @@ if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \
fi
# 20240910 e2df9bb44109
-clean_dep cddl/lib/libzpool abd_os c
+clean_dep cddl/lib/libzpool abd_os c "linux/zfs/abd_os\.c"