From 60bd953ca4905e8720513d2d9e12932c0ea9cc83 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 1 Dec 2015 18:24:40 -0800 Subject: [PATCH] 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 Issue zfsonlinux/spl#481 Issue zfsonlinux/spl#498 --- copy-builtin | 2 ++ 1 file changed, 2 insertions(+) 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" -- 2.40.0