mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-17 01:51:00 +03:00
93ce2b4ca5
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 <hutter2@llnl.gov>
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Pavel Zakharov <pavel.zakharov@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
TEST_ZIMPORT_SKIP="yes"
Closes #7556
111 lines
2.4 KiB
Bash
Executable File
111 lines
2.4 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
usage()
|
|
{
|
|
echo "usage: $0 <kernel source tree>" >&2
|
|
exit 1
|
|
}
|
|
|
|
[ "$#" -eq 1 ] || usage
|
|
KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
|
|
|
|
MODULES=()
|
|
for MODULE_DIR in module/*
|
|
do
|
|
[ -d "$MODULE_DIR" ] || continue
|
|
MODULES+=("${MODULE_DIR##*/}")
|
|
done
|
|
|
|
if ! [ -e 'zfs_config.h' ]
|
|
then
|
|
echo >&2
|
|
echo " $0: you did not run configure, or you're not in the ZFS source directory." >&2
|
|
echo " $0: run configure with --with-linux=$KERNEL_DIR and --enable-linux-builtin." >&2
|
|
echo >&2
|
|
exit 1
|
|
fi
|
|
|
|
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/include/zfs/"
|
|
|
|
for MODULE in "${MODULES[@]}"
|
|
do
|
|
sed -i.bak '/obj =/d' "$KERNEL_DIR/fs/zfs/$MODULE/Makefile"
|
|
sed -i.bak '/src =/d' "$KERNEL_DIR/fs/zfs/$MODULE/Makefile"
|
|
done
|
|
|
|
cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF"
|
|
config ZFS
|
|
tristate "ZFS filesystem support"
|
|
depends on EFI_PARTITION
|
|
select ZLIB_INFLATE
|
|
select ZLIB_DEFLATE
|
|
help
|
|
This is the ZFS filesystem from the ZFS On Linux project.
|
|
|
|
See http://zfsonlinux.org/
|
|
|
|
To compile this file system support as a module, choose M here.
|
|
|
|
If unsure, say N.
|
|
EOF
|
|
|
|
{
|
|
cat <<-"EOF"
|
|
ZFS_MODULE_CFLAGS = -I$(srctree)/include/zfs
|
|
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 = -D_KERNEL
|
|
ZFS_MODULE_CPPFLAGS += -UDEBUG -DNDEBUG
|
|
export ZFS_MODULE_CFLAGS ZFS_MODULE_CPPFLAGS
|
|
|
|
obj-$(CONFIG_ZFS) :=
|
|
EOF
|
|
|
|
for MODULE in "${MODULES[@]}"
|
|
do
|
|
echo 'obj-$(CONFIG_ZFS) += ' "$MODULE/"
|
|
done
|
|
} > "$KERNEL_DIR/fs/zfs/Kbuild"
|
|
|
|
add_after()
|
|
{
|
|
local FILE="$1"
|
|
local MARKER="$2"
|
|
local NEW="$3"
|
|
local LINE
|
|
|
|
while IFS='' read -r LINE
|
|
do
|
|
echo "$LINE"
|
|
|
|
if [ -n "$MARKER" -a "$LINE" = "$MARKER" ]
|
|
then
|
|
echo "$NEW"
|
|
MARKER=''
|
|
if IFS='' read -r LINE
|
|
then
|
|
[ "$LINE" != "$NEW" ] && echo "$LINE"
|
|
fi
|
|
fi
|
|
done < "$FILE" > "$FILE.new"
|
|
|
|
mv "$FILE.new" "$FILE"
|
|
}
|
|
|
|
add_after "$KERNEL_DIR/fs/Kconfig" 'if BLOCK' 'source "fs/zfs/Kconfig"'
|
|
add_after "$KERNEL_DIR/fs/Makefile" 'endif' 'obj-$(CONFIG_ZFS) += zfs/'
|
|
|
|
echo >&2
|
|
echo " $0: done." >&2
|
|
echo " $0: now you can build the kernel with ZFS support." >&2
|
|
echo " $0: make sure you enable ZFS support (CONFIG_ZFS) before building." >&2
|
|
echo >&2
|