Skip to content

Commit

Permalink
copy-builtin: SPL must be in Kbuild first
Browse files Browse the repository at this point in the history
The recent SPL merge caused a regression in kernels with ZFS integrated
into the sources where our modules would be initialized in alphabetical
order, despite icp requiring the spl module be loaded first. This caused
kernels with ZFS builtin to fail to boot.

We resolve this by adding a special case for the spl that lists it
first. It is somewhat ugly, but it works.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Matthew Thode <prometheanfire@gentoo.org>
Signed-off-by: Richard Yao <ryao@gentoo.org>
Closes openzfs#7595 
Closes openzfs#7606
  • Loading branch information
ryao authored and behlendorf committed Jun 15, 2018
1 parent 917f475 commit 517d247
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions copy-builtin
Expand Up @@ -12,9 +12,11 @@ usage()
KERNEL_DIR="$(readlink --canonicalize-existing "$1")"

MODULES=()
MODULES+="spl"
for MODULE_DIR in module/*
do
[ -d "$MODULE_DIR" ] || continue
[ "spl" = "${MODULE_DIR##*/}" ] && continue
MODULES+=("${MODULE_DIR##*/}")
done

Expand Down

0 comments on commit 517d247

Please sign in to comment.