]> granicus.if.org Git - zfs/commitdiff
Fix --enable-linux-builtin
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 2 Dec 2015 02:24:40 +0000 (18:24 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 2 Dec 2015 15:54:32 +0000 (07:54 -0800)
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 <behlendorf1@llnl.gov>
Issue zfsonlinux/spl#481
Issue zfsonlinux/spl#498

copy-builtin

index fbe20dda5fb273e22cc79799954e2bd95edf4467..762a34f9db18e9c623b11bb1dad21cebcd35b369 100755 (executable)
@@ -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"