From 37fd6e00a699aff3fea24199497e9484cd218a84 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Mon, 26 Aug 2013 09:23:09 -0700 Subject: [PATCH] Add script to fix file names in upstream patches Added a simple sed script to do a search and replace on the Illumos ZFS file names and replace them with the ZFS on Linux equivalent. Example usage: # Replace Illumos paths with Linux paths $ ./scripts/zfs2zol-patch.sed arc.c.patch > arc.c.patch.linux # Ensure the script worked as expected $ diff arc.c.patch arc.c.patch.linux # Apply the patch using Linux paths $ patch -p1 < arc.c.patch.linux Signed-off-by: Richard Yao Signed-off-by: Prakash Surya Signed-off-by: Brian Behlendorf Closes #1679 --- scripts/Makefile.am | 2 +- scripts/zfs2zol-patch.sed | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 scripts/zfs2zol-patch.sed diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 08a32b439..39d94ee82 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = zpool-config zpios-test zpios-profile -EXTRA_DIST = dkms.mkconf dkms.postinst kmodtool +EXTRA_DIST = dkms.mkconf dkms.postinst kmodtool zfs2zol-patch.sed pkgdatadir = $(datadir)/@PACKAGE@ dist_pkgdata_SCRIPTS = \ diff --git a/scripts/zfs2zol-patch.sed b/scripts/zfs2zol-patch.sed new file mode 100755 index 000000000..3a7280fd7 --- /dev/null +++ b/scripts/zfs2zol-patch.sed @@ -0,0 +1,15 @@ +#!/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 -- 2.40.0