X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=copy-builtin;h=b8e3a08de8eec7d1be91f7a17f9edd43d834b561;hb=4ae36ba73693360da4e6f714e88150a30edb08fa;hp=34c482bab697cf1672617e79a9a19940c46a9804;hpb=6a41a1c0107ad1e2a1baa403c04381c0b1dd8c8e;p=mirror_spl-debian.git diff --git a/copy-builtin b/copy-builtin index 34c482b..b8e3a08 100755 --- a/copy-builtin +++ b/copy-builtin @@ -88,32 +88,7 @@ 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~mm/ fs/~mm/ spl/ fs/~' "$KERNEL_DIR/Makefile"