git: 397a3893db1d - stable/14 - depend-cleanup.sh: fix dependency changes from latest OpenZFS import
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Dec 2024 17:38:46 UTC
The branch stable/14 has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=397a3893db1dabd9497e6324ba6afb489fbca037
commit 397a3893db1dabd9497e6324ba6afb489fbca037
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2024-12-12 17:23:55 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2024-12-12 17:29:09 +0000
depend-cleanup.sh: fix dependency changes from latest OpenZFS import
Backports fd3d3240b, 0980d0a03, 7a7741af18d (partial), 73c7cb57a
---
tools/build/depend-cleanup.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 7441cd1d7d81..a4d367d7c463 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -176,3 +176,8 @@ if [ -e "$f" ]; then
run rm -f "$p"/*.inc
fi
fi
+
+# 20241212 2ec8b6948070 zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14
+clean_dep cddl/lib/libzpool abd_os c "linux/zfs/abd_os\.c"
+clean_dep cddl/lib/libzpool arc_os c "linux/zfs/arc_os\.c"
+clean_dep cddl/lib/libzpool zfs_debug c "linux/zfs/zfs_debug\.c"