zpool: speed up importing large pools (#11469)

[mirror_zfs.git] / copy-builtin

diff --git a/copy-builtin b/copy-builtin
index 1dcfcb961ee8025d08e0d842affb2f05da1f9edd..36e19545d9c4413372671a3bbaee0932143e753c 100755 (executable)
--- a/copy-builtin
+++ b/copy-builtin
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -11,15 +11,6 @@ usage()
 [ "$#" -eq 1 ] || usage
 KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
 
-MODULES=()
-MODULES+="spl"
-for MODULE_DIR in module/*
-do
-       [ -d "$MODULE_DIR" ] || continue
-       [ "spl" = "${MODULE_DIR##*/}" ] && continue
-       MODULES+=("${MODULE_DIR##*/}")
-done
-
 if ! [ -e 'zfs_config.h' ]
 then
        echo >&2
@@ -30,19 +21,13 @@ then
 fi
 
 make clean || true
-scripts/make_gitrev.sh || true
+make gitrev
 
 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"
@@ -50,34 +35,15 @@ config ZFS
        select ZLIB_INFLATE
        select ZLIB_DEFLATE
        help
-         This is the ZFS filesystem from the ZFS On Linux project.
+         This is the ZFS filesystem from the OpenZFS project.
 
-         See http://zfsonlinux.org/
+         See https://github.com/openzfs/zfs
 
          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"