mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-22 02:37:15 +00:00
716fd348e0
Notable upstream pull request merges:
#10662 zvol_wait: Ignore locked zvols
#12789 Improve log spacemap load time
#12812 Improved zpool status output, list all affected datasets
#13277 FreeBSD: Use NDFREE_PNBUF if available
#13302 Make zfs_max_recordsize default to 16M
#13311 Fix error handling in FreeBSD's get/putpages VOPs
#13345 FreeBSD: Fix translation from ABD to physical pages
#13373 zfs: holds: dequadratify
#13375 Corrected edge case in uncompressed ARC->L2ARC handling
#13388 Improve mg_aliquot math
#13405 Reduce dbuf_find() lock contention
#13406 FreeBSD: use zero_region instead of allocating a dedicated page
Obtained from: OpenZFS
OpenZFS commit: c0cf6ed679
51 lines
1.2 KiB
Bash
Executable file
51 lines
1.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
set -ef
|
|
|
|
usage()
|
|
{
|
|
echo "usage: $0 <kernel source tree>" >&2
|
|
exit 1
|
|
}
|
|
|
|
[ "$#" -eq 1 ] || usage
|
|
KERNEL_DIR="$1"
|
|
|
|
if ! [ -e 'zfs_config.h' ]
|
|
then
|
|
echo "$0: you did not run configure, or you're not in the ZFS source directory."
|
|
echo "$0: run configure with --with-linux=$KERNEL_DIR and --enable-linux-builtin."
|
|
|
|
exit 1
|
|
fi >&2
|
|
|
|
make clean ||:
|
|
make gitrev
|
|
|
|
rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs"
|
|
cp -R include "$KERNEL_DIR/include/zfs"
|
|
cp -R module "$KERNEL_DIR/fs/zfs"
|
|
cp zfs_config.h "$KERNEL_DIR/include/zfs/"
|
|
|
|
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 OpenZFS project.
|
|
|
|
See https://github.com/openzfs/zfs
|
|
|
|
To compile this file system support as a module, choose M here.
|
|
|
|
If unsure, say N.
|
|
EOF
|
|
|
|
sed -i '/source "fs\/ext2\/Kconfig\"/i\source "fs/zfs/Kconfig"' "$KERNEL_DIR/fs/Kconfig"
|
|
echo 'obj-$(CONFIG_ZFS) += zfs/' >> "$KERNEL_DIR/fs/Makefile"
|
|
|
|
echo "$0: done. now you can build the kernel with ZFS support." >&2
|
|
echo "$0: make sure you enable ZFS support (CONFIG_ZFS) before building." >&2
|