diff options
| author | Brian Behlendorf <[email protected]> | 2015-12-01 18:18:14 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-12-02 07:52:51 -0800 |
| commit | 4e6f996cdd6e2cf6f1935ccdc35609c7d850ab98 (patch) | |
| tree | b83344741e27eccaf93f0f1a822d40544ad8ab2d /copy-builtin | |
| parent | e7b75d9b46fcfea149bf7fd1f53d40379e3c7b5d (diff) | |
Fix --enable-linux-builtin
Adding VPATH support, commit 37d7cd9, required that a `src`
and `obj` line be added to the top of the Makefiles. They
must be removed from the Makefiles when builtin.
The code which adds the `spl/` directory to the top level
Makefile was failing due to the addition of the `certs/` path.
The search pattern has been adjusted to be more tolerant.
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #481
Issue #498
Diffstat (limited to 'copy-builtin')
| -rwxr-xr-x | copy-builtin | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/copy-builtin b/copy-builtin index cd98b7a86..aa4307386 100755 --- a/copy-builtin +++ b/copy-builtin @@ -56,6 +56,8 @@ adjust_obj_paths() for MODULE in "${MODULES[@]}" do adjust_obj_paths "$KERNEL_DIR/spl/$MODULE/Makefile" + sed -i.bak '/obj =/d' "$KERNEL_DIR/spl/$MODULE/Makefile" + sed -i.bak '/src =/d' "$KERNEL_DIR/spl/$MODULE/Makefile" done cat > "$KERNEL_DIR/spl/Kconfig" <<"EOF" @@ -112,8 +114,9 @@ add_after() } add_after "$KERNEL_DIR/Kconfig" 'source "arch/$SRCARCH/Kconfig"' 'source "spl/Kconfig"' -# We must take care to build SPL before ZFS, else module initialization order will be wrong -sed -i 's#kernel/ mm/ fs/#kernel/ mm/ spl/ fs/#' "$KERNEL_DIR/Makefile" +# 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" echo >&2 echo " $0: done." >&2 |