c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

copy-builtin: SPL must be in Kbuild first (again)

Browse Source 
Commit bced7e3 accidentally reintroduced issue #7595 which was
previously addressed by 517d247.  Re-apply the original fix to
resolve the issue and include a comment to make it clear the
ordering is important.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Matthew Thode <prometheanfire@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9302
Closes #9208
This commit is contained in:
Brian Behlendorf 2019-09-11 11:09:50 -07:00 committed by GitHub
parent 25f06d677a
commit 490e23cdf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
copy-builtin
View File

@ -12,9 +12,16 @@ usage()
KERNEL_DIR="$(readlink --canonicalize-existing "$1")" KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
MODULES=() MODULES=()
# When integrated in to a monolithic kernel the spl module must appear
# first. This ensures its module initialization function is run before
# any of the other module initialization functions which depend on it.
MODULES+="spl"
for MODULE_DIR in module/* module/os/linux/* for MODULE_DIR in module/* module/os/linux/*
do do
[ -d "$MODULE_DIR" ] || continue [ -d "$MODULE_DIR" ] || continue
[ "spl" = "${MODULE_DIR##*/}" ] && continue
[ "os" = "${MODULE_DIR#*/}" ] && continue [ "os" = "${MODULE_DIR#*/}" ] && continue
MODULES+=("${MODULE_DIR#*/}") MODULES+=("${MODULE_DIR#*/}")
done done