The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=fd3d3240b0d7e4fa790e3d2b6d4e055a52754f32
commit fd3d3240b0d7e4fa790e3d2b6d4e055a52754f32
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2024-09-10 15:29:39 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2024-09-10 15:29:39 +0000
depend-cleanup.sh: Add a rule to work around abd_os.c dependency changes
Fixes incremental buildworld after the latest OpenZFS import.
Fixes: e2df9bb44109 ("zfs: merge openzfs/zfs@b10992582")
Sponsored by: Klara, Inc.
---
tools/build/depend-cleanup.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index b7231422c5ed..da3dd05c6c4d 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -182,3 +182,6 @@ if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \
echo "removing rescue.mk without nvme_util.o"
rm -f "$OBJTOP"/rescue/rescue/rescue.mk
fi
+
+# 20240910 e2df9bb44109
+clean_dep cddl/lib/libzpool abd_os c
