Skip to content

Commit

Permalink
Fix --enable-linux-builtin
Browse files Browse the repository at this point in the history
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 openzfs#481
Issue openzfs#498
  • Loading branch information
behlendorf committed Dec 2, 2015
1 parent e7b75d9 commit 4e6f996
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions copy-builtin
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4e6f996

Please sign in to comment.