Merge branch 'add_breaks_replaces_zfs_initramfs' into 'master'

[mirror_zfs-debian.git] / copy-builtin

diff --git a/copy-builtin b/copy-builtin
index fbe20dda5fb273e22cc79799954e2bd95edf4467..d04314bb362f0350fa6a748173507dd07d361651 100755 (executable)
--- a/copy-builtin
+++ b/copy-builtin
@@ -34,27 +34,10 @@ 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"
-}
-
 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"
@@ -76,8 +59,11 @@ 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
+       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_CLFAGS += -std=gnu99
        export ZFS_MODULE_CFLAGS
 
        obj-$(CONFIG_ZFS) :=