Merge pull request #92081 from CrystalGamma/modules-closure
makeModulesClosure: handle builtin modules better
This commit is contained in:
commit
efc739f1d2
@ -19,36 +19,55 @@ version=$(cd $kernel/lib/modules && ls -d *)
|
||||
echo "kernel version is $version"
|
||||
|
||||
# Determine the dependencies of each root module.
|
||||
closure=
|
||||
mkdir -p $out/lib/modules/"$version"
|
||||
touch closure
|
||||
for module in $rootModules; do
|
||||
echo "root module: $module"
|
||||
deps=$(modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \
|
||||
| sed 's/^insmod //') \
|
||||
|| if test -z "$allowMissing"; then exit 1; fi
|
||||
if [[ "$deps" != builtin* ]]; then
|
||||
closure="$closure $deps"
|
||||
modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \
|
||||
| while read cmd module args; do
|
||||
case "$cmd" in
|
||||
builtin)
|
||||
touch found
|
||||
echo "$module" >>closure
|
||||
echo " builtin dependency: $module";;
|
||||
insmod)
|
||||
touch found
|
||||
if ! test -e "$module"; then
|
||||
echo " dependency not found: $module"
|
||||
exit 1
|
||||
fi
|
||||
target=$(echo "$module" | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^")
|
||||
if test -e "$target"; then
|
||||
echo " dependency already copied: $module"
|
||||
continue
|
||||
fi
|
||||
echo "$module" >>closure
|
||||
echo " copying dependency: $module"
|
||||
mkdir -p $(dirname $target)
|
||||
cp "$module" "$target"
|
||||
# If the kernel is compiled with coverage instrumentation, it
|
||||
# contains the paths of the *.gcda coverage data output files
|
||||
# (which it doesn't actually use...). Get rid of them to prevent
|
||||
# the whole kernel from being included in the initrd.
|
||||
nuke-refs "$target"
|
||||
echo "$target" >> $out/insmod-list;;
|
||||
*)
|
||||
echo " unexpected modprobe output: $cmd $module"
|
||||
exit 1;;
|
||||
esac
|
||||
done || test -n "$allowMissing"
|
||||
if ! test -e found; then
|
||||
echo " not found"
|
||||
if test -z "$allowMissing"; then
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
rm found
|
||||
fi
|
||||
done
|
||||
|
||||
echo "closure:"
|
||||
mkdir -p $out/lib/modules/"$version"
|
||||
for module in $closure; do
|
||||
target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^")
|
||||
if test -e "$target"; then continue; fi
|
||||
if test \! -e "$module"; then continue; fi # XXX: to avoid error with "cp builtin builtin"
|
||||
mkdir -p $(dirname $target)
|
||||
echo $module
|
||||
cp $module $target
|
||||
# If the kernel is compiled with coverage instrumentation, it
|
||||
# contains the paths of the *.gcda coverage data output files
|
||||
# (which it doesn't actually use...). Get rid of them to prevent
|
||||
# the whole kernel from being included in the initrd.
|
||||
nuke-refs $target
|
||||
echo $target >> $out/insmod-list
|
||||
done
|
||||
|
||||
mkdir -p $out/lib/firmware
|
||||
for module in $closure; do
|
||||
for module in $(cat closure); do
|
||||
for i in $(modinfo -F firmware $module); do
|
||||
mkdir -p "$out/lib/firmware/$(dirname "$i")"
|
||||
echo "firmware for $module: $i"
|
||||
|
Loading…
Reference in New Issue
Block a user