Fix typo/etc in module/zfs/zfs_ctldir.c

[mirror_zfs.git] / copy-builtin

diff --git a/copy-builtin b/copy-builtin
index 795025b380118ab0ef059c6169f3ab9c80bc6c1b..1dcfcb961ee8025d08e0d842affb2f05da1f9edd 100755 (executable)
--- a/copy-builtin
+++ b/copy-builtin
@@ -12,9 +12,11 @@ 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
 
@@ -28,11 +30,12 @@ then
 fi
 
 make clean || true
+scripts/make_gitrev.sh || 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 +46,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 +62,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