diff options
| author | Brian Behlendorf <[email protected]> | 2018-02-15 17:53:18 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-05-29 16:00:33 -0700 |
| commit | 93ce2b4ca5a40c41ac945cd3aaf4a4a22bb751e1 (patch) | |
| tree | 6832f5c9dfdbe0f0bd5c8708344a769676b1f95d /copy-builtin | |
| parent | 1272941f49321bcb7b26025670720c98785427ee (diff) | |
Update build system and packaging
Minimal changes required to integrate the SPL sources in to the
ZFS repository build infrastructure and packaging.
Build system and packaging:
* Renamed SPL_* autoconf m4 macros to ZFS_*.
* Removed redundant SPL_* autoconf m4 macros.
* Updated the RPM spec files to remove SPL package dependency.
* The zfs package obsoletes the spl package, and the zfs-kmod
package obsoletes the spl-kmod package.
* The zfs-kmod-devel* packages were updated to add compatibility
symlinks under /usr/src/spl-x.y.z until all dependent packages
can be updated. They will be removed in a future release.
* Updated copy-builtin script for in-kernel builds.
* Updated DKMS package to include the spl.ko.
* Updated stale AUTHORS file to include all contributors.
* Updated stale COPYRIGHT and included the SPL as an exception.
* Renamed README.markdown to README.md
* Renamed OPENSOLARIS.LICENSE to LICENSE.
* Renamed DISCLAIMER to NOTICE.
Required code changes:
* Removed redundant HAVE_SPL macro.
* Removed _BOOT from nvpairs since it doesn't apply for Linux.
* Initial header cleanup (removal of empty headers, refactoring).
* Remove SPL repository clone/build from zimport.sh.
* Use of DEFINE_RATELIMIT_STATE and DEFINE_SPINLOCK removed due
to build issues when forcing C99 compilation.
* Replaced legacy ACCESS_ONCE with READ_ONCE.
* Include needed headers for `current` and `EXPORT_SYMBOL`.
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: Pavel Zakharov <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
TEST_ZIMPORT_SKIP="yes"
Closes #7556
Diffstat (limited to 'copy-builtin')
| -rwxr-xr-x | copy-builtin | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/copy-builtin b/copy-builtin index 795025b38..02c0926c3 100755 --- a/copy-builtin +++ b/copy-builtin @@ -32,7 +32,7 @@ make clean || true rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs" cp --recursive include "$KERNEL_DIR/include/zfs" cp --recursive module "$KERNEL_DIR/fs/zfs" -cp zfs_config.h "$KERNEL_DIR/" +cp zfs_config.h "$KERNEL_DIR/include/zfs/" for MODULE in "${MODULES[@]}" do @@ -43,7 +43,6 @@ done cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF" config ZFS tristate "ZFS filesystem support" - depends on SPL depends on EFI_PARTITION select ZLIB_INFLATE select ZLIB_DEFLATE @@ -60,11 +59,10 @@ EOF { cat <<-"EOF" ZFS_MODULE_CFLAGS = -I$(srctree)/include/zfs - ZFS_MODULE_CFLAGS += -I$(srctree)/include/spl - ZFS_MODULE_CFLAGS += -include $(srctree)/spl_config.h - ZFS_MODULE_CFLAGS += -include $(srctree)/zfs_config.h + ZFS_MODULE_CFLAGS += -I$(srctree)/include/zfs/spl + ZFS_MODULE_CFLAGS += -include $(srctree)/include/zfs/zfs_config.h ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement - ZFS_MODULE_CPPFLAGS = -DHAVE_SPL -D_KERNEL + ZFS_MODULE_CPPFLAGS = -D_KERNEL ZFS_MODULE_CPPFLAGS += -UDEBUG -DNDEBUG export ZFS_MODULE_CFLAGS ZFS_MODULE_CPPFLAGS |