diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-28 12:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-28 12:01:36 +0000 |
| commit | 5e17795097bf7c3947186b2a74e019479eca77f8 (patch) | |
| tree | ef29bfc2402c89b2e01178462f4cf0c74b3a2270 /pkgs/build-support | |
| parent | 819ab289409e05de56591a00dc6bd9c80a73bace (diff) | |
| parent | a86d1125195505d4ea8997b12507b9c623511256 (diff) | |
| download | nixlib-5e17795097bf7c3947186b2a74e019479eca77f8.tar nixlib-5e17795097bf7c3947186b2a74e019479eca77f8.tar.gz nixlib-5e17795097bf7c3947186b2a74e019479eca77f8.tar.bz2 nixlib-5e17795097bf7c3947186b2a74e019479eca77f8.tar.lz nixlib-5e17795097bf7c3947186b2a74e019479eca77f8.tar.xz nixlib-5e17795097bf7c3947186b2a74e019479eca77f8.tar.zst nixlib-5e17795097bf7c3947186b2a74e019479eca77f8.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/kernel/compress-firmware-xz.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix index a69b31bb3bd0..cb9ce7a71338 100644 --- a/pkgs/build-support/kernel/compress-firmware-xz.nix +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -3,7 +3,9 @@ firmware: let - args = lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; }; + args = { + allowedRequisites = []; + } // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; }; in runCommand "${firmware.name}-xz" args '' @@ -15,10 +17,13 @@ runCommand "${firmware.name}-xz" args '' sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --) (cd ${firmware} && find lib/firmware -type l) | while read link; do target="$(readlink "${firmware}/$link")" - if [ -f $target ]; then + if [ -f "${firmware}/$link" ]; then ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz" else ln -vs -- "''${target/^${firmware}/$out}" "$out/$link" fi done + + echo "Checking for broken symlinks:" + find -L $out -type l -print -execdir false -- '{}' '+' '' |