1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Brian Behlendorf <behlendorf1@llnl.gov>
3 Date: Wed, 12 Sep 2018 20:42:34 -0400
4 Subject: [PATCH] Linux 4.18 compat: Kconfig
6 The kernel's top level Kconfig was updated in 4.18 such that it
7 no longer matches the expected pattern preventing the spl source
8 from being inserted. Simplify the existing logic to always insert
9 the entry at the end of the file since an exact location is not
10 required, unlike in the Makefile.
12 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
15 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 copy-builtin | 27 +--------------------------
18 1 file changed, 1 insertion(+), 26 deletions(-)
20 diff --git a/copy-builtin b/copy-builtin
21 index 34c482b..b8e3a08 100755
24 @@ -88,32 +88,7 @@ EOF
26 } > "$KERNEL_DIR/spl/Kbuild"
35 - while IFS='' read -r LINE
39 - if [ -n "$MARKER" -a "$LINE" = "$MARKER" ]
43 - if IFS='' read -r LINE
45 - [ "$LINE" != "$NEW" ] && echo "$LINE"
48 - done < "$FILE" > "$FILE.new"
50 - mv "$FILE.new" "$FILE"
53 -add_after "$KERNEL_DIR/Kconfig" 'source "arch/$SRCARCH/Kconfig"' 'source "spl/Kconfig"'
54 +echo 'source "spl/Kconfig"' >>"$KERNEL_DIR/Kconfig"
55 # We must take care to build SPL before ZFS, otherwise the symbols required
56 # to link ZFS will not be available.
57 sed -i 's~mm/ fs/~mm/ spl/ fs/~' "$KERNEL_DIR/Makefile"