ztest: scrub ddt repair

[mirror_zfs.git] / copy-builtin

diff --git a/copy-builtin b/copy-builtin
index a053fd8a37aa06b93ca5520ee7559fc8d2967915..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,39 +30,25 @@ 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/"
-
-adjust_obj_paths()
-{
-       local FILE="$1"
-       local LINE OBJPATH
-
-       while IFS='' read -r LINE
-       do
-               OBJPATH="${LINE#\$(MODULE)-objs += }"
-               if [ "$OBJPATH" = "$LINE" ]
-               then
-                       echo "$LINE"
-               else
-                       echo "\$(MODULE)-objs += ${OBJPATH##*/}"
-               fi
-       done < "$FILE" > "$FILE.new"
-       mv "$FILE.new" "$FILE"
-}
+cp zfs_config.h "$KERNEL_DIR/include/zfs/"
 
 for MODULE in "${MODULES[@]}"
 do
-       adjust_obj_paths "$KERNEL_DIR/fs/zfs/$MODULE/Makefile"
+       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"
-       depends on SPL
+       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.
 
@@ -73,9 +61,13 @@ EOF
 
 {
        cat <<-"EOF"
-       ZFS_MODULE_CFLAGS  = -I$(srctree)/include/zfs -I$(srctree)/include/spl 
-       ZFS_MODULE_CFLAGS += -include $(srctree)/spl_config.h -include $(srctree)/zfs_config.h
-       export ZFS_MODULE_CFLAGS
+       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