diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-01-12 14:30:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 14:30:41 +0000 |
| commit | ba0910069d5feddc008718ab5bfee73b49571452 (patch) | |
| tree | 4dbf540b29d7fdaa05dae0ebc0dc98aee8f9c682 /pkgs/build-support | |
| parent | 044a92623c502872803052382b90d0b727334233 (diff) | |
| parent | 49130f93b73e61a9e3dff31c3c13c5a9096fa969 (diff) | |
| download | nixpkgs-ba0910069d5feddc008718ab5bfee73b49571452.tar nixpkgs-ba0910069d5feddc008718ab5bfee73b49571452.tar.gz nixpkgs-ba0910069d5feddc008718ab5bfee73b49571452.tar.bz2 nixpkgs-ba0910069d5feddc008718ab5bfee73b49571452.tar.lz nixpkgs-ba0910069d5feddc008718ab5bfee73b49571452.tar.xz nixpkgs-ba0910069d5feddc008718ab5bfee73b49571452.tar.zst nixpkgs-ba0910069d5feddc008718ab5bfee73b49571452.zip | |
Merge pull request #109030 from xaverdh/modules-closure-ignore-missing-firmware
nixos/modules-closure.sh: don't fail if firmware is missing
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/kernel/modules-closure.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 3f895d9cfed..3b3a38ea1d3 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -81,7 +81,8 @@ for module in $(cat closure); 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 + cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null \ + || echo "WARNING: missing firmware $i for module $module" done done |