summary refs log tree commit diff
path: root/pkgs/build-support/kernel/modules-closure.sh
diff options
context:
space:
mode:
authorArthur Gautier <baloo@superbaloo.net>2020-08-27 10:42:43 -0700
committerArthur Gautier <baloo@superbaloo.net>2020-08-27 10:48:18 -0700
commit70bc1a3f49516a407d8f919c161162951d34ceaf (patch)
tree451ae3fdf4126928b67fe154ab359d1a6d01f216 /pkgs/build-support/kernel/modules-closure.sh
parentee8572d6b31b8188f9d500a1a3036316f2aa21c0 (diff)
downloadnixpkgs-70bc1a3f49516a407d8f919c161162951d34ceaf.tar
nixpkgs-70bc1a3f49516a407d8f919c161162951d34ceaf.tar.gz
nixpkgs-70bc1a3f49516a407d8f919c161162951d34ceaf.tar.bz2
nixpkgs-70bc1a3f49516a407d8f919c161162951d34ceaf.tar.lz
nixpkgs-70bc1a3f49516a407d8f919c161162951d34ceaf.tar.xz
nixpkgs-70bc1a3f49516a407d8f919c161162951d34ceaf.tar.zst
nixpkgs-70bc1a3f49516a407d8f919c161162951d34ceaf.zip
makeModulesClosuse: read modules from corrent kernel version
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.
Diffstat (limited to 'pkgs/build-support/kernel/modules-closure.sh')
-rw-r--r--pkgs/build-support/kernel/modules-closure.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index 2e3d3e25a09..3f895d9cfed 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -78,7 +78,7 @@ for module in $(cat closure); do
     #
     # For now, the workaround is just to filter out the extraneous lines out
     # 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")"
         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