From d112232f5ec4b25e8446f9a2430d1a63908e6e5a Mon Sep 17 00:00:00 2001 From: Chip Parker Date: Mon, 25 Jan 2016 19:13:50 -0600 Subject: [PATCH] Ensure spl/ only occurs once in core-y Update copy-builtin so it may be run multiple times against the kernel source tree. This change makes sed more discriminating to ensure spl/ only occurs once in core-y. Signed-off-by: Chip Parker Signed-off-by: Brian Behlendorf Closes #526 --- copy-builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copy-builtin b/copy-builtin index aa43073866..34c482bab6 100755 --- a/copy-builtin +++ b/copy-builtin @@ -116,7 +116,7 @@ add_after() add_after "$KERNEL_DIR/Kconfig" 'source "arch/$SRCARCH/Kconfig"' 'source "spl/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