public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makeModulesClosure: handle builtin modules better 

The previous code discarded entire dependency trees if the first entry in the dependency list compiled by `modprobe --show-depends` is a builtin and otherwise handled its output in a rather hackish way.
This commit is contained in:
CrystalGamma 2020-07-02 20:15:08 +02:00
parent 83ec61c486
commit b155b1dafb
1 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pkgs/build-support/kernel/modules-closure.sh
View File

@ -19,36 +19,55 @@ version=$(cd $kernel/lib/modules && ls -d *)
echo "kernel version is $version" echo "kernel version is $version"
# Determine the dependencies of each root module. # Determine the dependencies of each root module.
closure= mkdir -p $out/lib/modules/"$version"
touch closure
for module in $rootModules; do for module in $rootModules; do
echo "root module: $module" echo "root module: $module"
deps=$(modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \ modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \
| sed 's/^insmod //') \ | while read cmd module args; do
|| if test -z "$allowMissing"; then exit 1; fi case "$cmd" in
if [[ "$deps" != builtin* ]]; then builtin)
closure="$closure $deps" 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 fi
done 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 mkdir -p $out/lib/firmware
for module in $closure; do for module in $(cat closure); do
for i in $(modinfo -F firmware $module); do for i in $(modinfo -F firmware $module); do
mkdir -p "$out/lib/firmware/$(dirname "$i")" mkdir -p "$out/lib/firmware/$(dirname "$i")"
echo "firmware for $module: $i" echo "firmware for $module: $i"