copy-builtin: SPL must be in Kbuild first

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 #7595
Closes #7606

diff --git a/copy-builtin b/copy-builtin
index 02c0926c325ea542786f3494a6489704f5ca97cd..8be8b4381b37579ef60d437628a8266288d06413 100755 (executable)
--- a/copy-builtin
+++ b/copy-builtin
@@ -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