diff options
author | Chip Parker <aparker@enthought.com> | 2016-01-25 19:13:50 -0600 |
---|---|---|
committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2016-01-26 11:54:24 -0800 |
commit | d112232f5ec4b25e8446f9a2430d1a63908e6e5a (patch) | |
tree | 9a8bea2e90e2fb5945aec1faee1f57e2d4d75df5 /copy-builtin | |
parent | 6b38e7510fbeb64785c7e042d8384f2141e9c557 (diff) |
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 <aparker@enthought.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #526
Diffstat (limited to 'copy-builtin')
-rwxr-xr-x | copy-builtin | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/copy-builtin b/copy-builtin index aa4307386..34c482bab 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 |