Linux: Align MODULE_LICENSE macro text

[mirror_zfs.git] / copy-builtin

diff --git a/copy-builtin b/copy-builtin
index fbe20dda5fb273e22cc79799954e2bd95edf4467..18cc741b58e79dba01aa1f6d4970ab7b8a859b11 100755 (executable)
--- a/copy-builtin
+++ b/copy-builtin
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 
-set -e
+set -ef
 
 usage()
 {
@@ -9,116 +9,42 @@ usage()
 }
 
 [ "$#" -eq 1 ] || usage
-KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
-
-MODULES=()
-for MODULE_DIR in module/*
-do
-       [ -d "$MODULE_DIR" ] || continue
-       MODULES+=("${MODULE_DIR##*/}")
-done
+KERNEL_DIR="$1"
 
 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
+       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
+fi >&2
 
-make clean || true
+make clean ||:
+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/"
+cp -R include "$KERNEL_DIR/include/zfs"
+cp -R module "$KERNEL_DIR/fs/zfs"
+cp zfs_config.h "$KERNEL_DIR/include/zfs/"
 
-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"
-}
-
-for MODULE in "${MODULES[@]}"
-do
-       adjust_obj_paths "$KERNEL_DIR/fs/zfs/$MODULE/Makefile"
-done
-
-cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF"
+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
        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 -I$(srctree)/include/spl 
-       ZFS_MODULE_CFLAGS += -include $(srctree)/spl_config.h -include $(srctree)/zfs_config.h
-       export ZFS_MODULE_CFLAGS
-
-       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/'
+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 >&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
+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