diff options
| author | Brian Behlendorf <[email protected]> | 2016-10-04 11:20:38 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-04 11:20:38 -0700 |
| commit | 5cc78dc81232bc474d25ccfcacb42d80d83c5310 (patch) | |
| tree | 7dfaccfc85d5e687a7334450f3dbf16865bf3995 /scripts | |
| parent | 0c313d2f7451041e9cc952fe68fb500efef52fe1 (diff) | |
| parent | 7d75815dc950bdce3fd03cc40a3352d93c270e0f (diff) | |
Merge OpenZFS 4185
OpenZFS 4185 - add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
Reviewed-by: Chunwei Chen <[email protected]>
Reviewed-by: Tom Caputi <[email protected]>
Reviewed-by: David Quigley <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tony Hutter <[email protected]>
Closes #4760
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/zfs2zol-patch.sed | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/scripts/zfs2zol-patch.sed b/scripts/zfs2zol-patch.sed index e6fc5c8b0..d4def4429 100755 --- a/scripts/zfs2zol-patch.sed +++ b/scripts/zfs2zol-patch.sed @@ -19,3 +19,22 @@ 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 + +# +# The usr/src/common/zfs/ files go in a couple different dirs. +# usr/src/common/zfs/zfeature_common.c goes in module/zfs +# +s:usr/src/common/zfs/zfeature_common.c:module/zfs/zfeature_common.c:g + +# ...but most of the rest of the C files go in module/zcommon +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 |