gbp-dch: update

[mirror_spl-debian.git] / copy-builtin

diff --git a/copy-builtin b/copy-builtin
index aa4307386688e9c2971abaf7ee345e731d6c6d81..b8e3a08de8eec7d1be91f7a17f9edd43d834b561 100755 (executable)
--- a/copy-builtin
+++ b/copy-builtin
@@ -88,35 +88,10 @@ EOF
        done
 } > "$KERNEL_DIR/spl/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/Kconfig" 'source "arch/$SRCARCH/Kconfig"' 'source "spl/Kconfig"'
+echo 'source "spl/Kconfig"' >>"$KERNEL_DIR/Kconfig"
 # We must take care to build SPL before ZFS, otherwise the symbols required
 # to link ZFS will not be available.
-sed -i 's#+= kernel/#+= kernel/ spl/#' "$KERNEL_DIR/Makefile"
+sed -i 's~mm/ fs/~mm/ spl/ fs/~' "$KERNEL_DIR/Makefile"
 
 echo >&2
 echo "    $0: done." >&2