diff options
| author | Brian Behlendorf <[email protected]> | 2019-09-11 11:09:50 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-11 11:09:50 -0700 |
| commit | 490e23cdf498d6aedb449c9dc606ae4e114d18b7 (patch) | |
| tree | 94208d2001fa4738762a0faf0bf4e3342378e69e | |
| parent | 25f06d677a81a65ca98fa3d725ab5031a4864104 (diff) | |
copy-builtin: SPL must be in Kbuild first (again)
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 <[email protected]>
Reviewed-by: Matthew Thode <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #9302
Closes #9208
| -rwxr-xr-x | copy-builtin | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/copy-builtin b/copy-builtin index c108cfc67..ee3b081ca 100755 --- a/copy-builtin +++ b/copy-builtin @@ -12,9 +12,16 @@ usage() KERNEL_DIR="$(readlink --canonicalize-existing "$1")" 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/* do [ -d "$MODULE_DIR" ] || continue + [ "spl" = "${MODULE_DIR##*/}" ] && continue [ "os" = "${MODULE_DIR#*/}" ] && continue MODULES+=("${MODULE_DIR#*/}") done |