diff options
| author | Brian Behlendorf <[email protected]> | 2015-12-01 18:24:40 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-12-02 07:54:32 -0800 |
| commit | 60bd953ca4905e8720513d2d9e12932c0ea9cc83 (patch) | |
| tree | 0387cf311db7af3c203259c77fb49d436d67543f /copy-builtin | |
| parent | 61d482f7cd1687177185140699c6843c904b38d4 (diff) | |
Fix --enable-linux-builtin
Adding VPATH support, commit 47a4a6f, required that a `src`
and `obj` line be added to the top of the Makefiles. They
must be removed from the Makefiles when builtin.
Signed-off-by: Brian Behlendorf <[email protected]>
Issue zfsonlinux/spl#481
Issue zfsonlinux/spl#498
Diffstat (limited to 'copy-builtin')
| -rwxr-xr-x | copy-builtin | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/copy-builtin b/copy-builtin index fbe20dda5..762a34f9d 100755 --- a/copy-builtin +++ b/copy-builtin @@ -55,6 +55,8 @@ adjust_obj_paths() for MODULE in "${MODULES[@]}" do adjust_obj_paths "$KERNEL_DIR/fs/zfs/$MODULE/Makefile" + sed -i.bak '/obj =/d' "$KERNEL_DIR/fs/zfs/$MODULE/Makefile" + sed -i.bak '/src =/d' "$KERNEL_DIR/fs/zfs/$MODULE/Makefile" done cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF" |