c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

copy-builtin: SPL must be in Kbuild first

Browse Source 
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
This commit is contained in:
Richard Yao 2018-06-15 18:16:29 -04:00 committed by Brian Behlendorf
parent 917f475fba
commit 517d247192
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
copy-builtin
View File

@ -12,9 +12,11 @@ usage()
KERNEL_DIR="$(readlink --canonicalize-existing "$1")" KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
MODULES=() MODULES=()
MODULES+="spl"
for MODULE_DIR in module/* for MODULE_DIR in module/*
do do
[ -d "$MODULE_DIR" ] || continue [ -d "$MODULE_DIR" ] || continue
[ "spl" = "${MODULE_DIR##*/}" ] && continue
MODULES+=("${MODULE_DIR##*/}") MODULES+=("${MODULE_DIR##*/}")
done done