alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

makeModulesClosuse: read modules from corrent kernel version

Browse source 
Before this commit, the firmware information would be loaded from the
currently running kernel, not from the kernel to be loaded.

This commit ensures the correct kernel version and modules are read.
This commit is contained in:
Arthur Gautier 2020-08-27 10:42:43 -07:00
parent ee8572d6b3
commit 70bc1a3f49
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/kernel/modules-closure.sh
View file

@ -78,7 +78,7 @@ for module in $(cat closure); do
# #
# For now, the workaround is just to filter out the extraneous lines out # For now, the workaround is just to filter out the extraneous lines out
# of its output. # of its output.
for i in $(modinfo -F firmware $module | grep -v '^name:'); do for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); 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"
cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi