diff options
| author | Richard Yao <ryao@gentoo.org> | 2018-06-15 22:16:29 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2018-06-15 22:16:29 +0000 |
| commit | 517d2471921fc44622dc737b09b655829b8c9c6f (patch) | |
| tree | 37a7ed2ecda3aa802f2a641f5f5f88c39a17de1d /copy-builtin | |
| parent | 917f475fba03ceb4e11c7aa35aff09c47a6c596e (diff) | |
| download | src-517d2471921fc44622dc737b09b655829b8c9c6f.tar.gz src-517d2471921fc44622dc737b09b655829b8c9c6f.zip | |
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
Diffstat (limited to 'copy-builtin')
| -rwxr-xr-x | copy-builtin | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/copy-builtin b/copy-builtin index 02c0926c325e..8be8b4381b37 100755 --- 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 |