4 files changed, 3 insertions, 59 deletions
diff --git a/sys/contrib/openzfs/scripts/Makefile.am b/sys/contrib/openzfs/scripts/Makefile.am
index f623526307b4..bff5f8b78a85 100644
--- a/sys/contrib/openzfs/scripts/Makefile.am
+++ b/sys/contrib/openzfs/scripts/Makefile.am
@@ -28,9 +28,7 @@ endif
 
 dist_noinst_DATA += \
 	%D%/cstyle.pl \
-	%D%/update_authors.pl \
-	%D%/zfs2zol-patch.sed \
-	%D%/zol2zfs-patch.sed
+	%D%/update_authors.pl
 
 SHELLCHECKSCRIPTS += $(dist_scripts_SCRIPTS) $(dist_noinst_SCRIPTS)
 
diff --git a/sys/contrib/openzfs/scripts/spdxcheck.pl b/sys/contrib/openzfs/scripts/spdxcheck.pl
index 4d4e14368beb..e1af3150bccd 100755
--- a/sys/contrib/openzfs/scripts/spdxcheck.pl
+++ b/sys/contrib/openzfs/scripts/spdxcheck.pl
@@ -124,14 +124,12 @@ my $untagged_patterns = q(
 	include/os/freebsd/spl/sys/inttypes.h
 	include/os/freebsd/spl/sys/mode.h
 	include/os/freebsd/spl/sys/trace.h
-	include/os/freebsd/spl/sys/trace_zfs.h
+	include/os/freebsd/zfs/sys/trace_zfs.h
 	include/os/freebsd/zfs/sys/zpl.h
 	include/os/linux/kernel/linux/page_compat.h
-	lib/libspl/include/os/freebsd/sys/sysmacros.h
 	lib/libspl/include/sys/string.h
-	lib/libspl/include/sys/trace_spl.h
-	lib/libspl/include/sys/trace_zfs.h
 	lib/libzdb/libzdb.c
+	lib/libzpool/include/sys/trace_zfs.h
 	module/lua/setjmp/setjmp.S
 	module/lua/setjmp/setjmp_ppc.S
 	module/zstd/include/sparc_compat.h
diff --git a/sys/contrib/openzfs/scripts/zfs2zol-patch.sed b/sys/contrib/openzfs/scripts/zfs2zol-patch.sed
deleted file mode 100755
index 2d744cd5de52..000000000000
--- a/sys/contrib/openzfs/scripts/zfs2zol-patch.sed
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sed -f
-
-s:usr/src/uts/common/fs/zfs/sys:include/sys:g
-s:usr/src/uts/common/fs/zfs:module/zfs:g
-s:usr/src/lib/libzpool:lib/libzpool:g
-s:usr/src/cmd:cmd:g
-s:usr/src/common/nvpair:module/nvpair:g
-s:usr/src/lib/libzfs/common/libzfs.h:include/libzfs.h:g
-s:usr/src/man/man1m/zfs.1m:man/man8/zfs.8:g
-s:usr/src/uts/common/sys:include/sys:g
-s:usr/src/lib/libzfs_core/common/libzfs_core.h:include/libzfs_core.h:g
-s:usr/src/lib/libzfs/common:lib/libzfs:g
-s:usr/src/lib/libzfs_core/common:lib/libzfs_core:g
-s:lib/libzpool/common/sys:include/sys:g
-s:lib/libzpool/common:lib/libzpool:g
-
-s:usr/src/test/zfs-tests/include:tests/zfs-tests/include:g
-s:usr/src/test/zfs-tests/runfiles:tests/runfiles:g
-s:usr/src/test/zfs-tests/tests/functional:tests/zfs-tests/tests/functional:g
-s:usr/src/test/zfs-tests/tests/perf:tests/zfs-tests/tests/perf:g
-s:usr/src/test/test-runner/cmd/run.py:tests/test-runner/cmd/test-runner.py:g
-s:usr/src/common/zfs/\(.*\)\.c:module/zcommon/\1.c:g
-
-# crypto framework
-s:usr/src/common/crypto:module/icp/algs:g
-s:usr/src/uts/common/crypto/io:module/icp/io:g
-
-# Headers
-s:usr/src/common/zfs/\(.*\)\.h:include/\1.h:g
-
-# Man pages
-s:usr/src/man:man:g
diff --git a/sys/contrib/openzfs/scripts/zol2zfs-patch.sed b/sys/contrib/openzfs/scripts/zol2zfs-patch.sed
deleted file mode 100755
index 0ca4b6cd6b7e..000000000000
--- a/sys/contrib/openzfs/scripts/zol2zfs-patch.sed
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sed -f
-
-s:cmd:usr/src/cmd:g
-s:include/libzfs.h:usr/src/lib/libzfs/common/libzfs.h:g
-s:include/libzfs_core.h:usr/src/lib/libzfs_core/common/libzfs_core.h:g
-s:include/sys:lib/libzpool/common/sys:g
-s:include/sys:usr/src/uts/common/fs/zfs/sys:g
-s:include/sys:usr/src/uts/common/sys:g
-s:include/zfs_fletcher.h:usr/src/common/zfs/zfs_fletcher.h:g
-s:include:usr/src/common/zfs:g
-s:lib/libzfs:usr/src/lib/libzfs/common:g
-s:lib/libzfs_core:usr/src/lib/libzfs_core/common:g
-s:lib/libzpool:lib/libzpool/common:g
-s:lib/libzpool:usr/src/lib/libzpool:g
-s:man/man7/zpool-features.7:usr/src/man/man5/zpool-features.5:g
-s:man/man8/zfs.8:usr/src/man/man1m/zfs.1m:g
-s:module/nvpair:usr/src/common/nvpair:g
-s:module/zcommon:usr/src/common/zfs/:g
-s:module/zfs:usr/src/uts/common/fs/zfs:g
-s:tests/zfs-tests:test/zfs-tests:g