summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-12 06:01:25 +0000
committerGitHub <noreply@github.com>2021-07-12 06:01:25 +0000
commit5efb7d8d19aa468315aef06213d3f89567013461 (patch)
tree638d47aff39ff5dfaf9715ae0a47a8c88139db70 /pkgs/os-specific
parent909d63d2f7a666d32c52eccf230a51c7a0d28f34 (diff)
parent93524fa8767947de724714fae9dd3617f84f00be (diff)
downloadnixpkgs-5efb7d8d19aa468315aef06213d3f89567013461.tar
nixpkgs-5efb7d8d19aa468315aef06213d3f89567013461.tar.gz
nixpkgs-5efb7d8d19aa468315aef06213d3f89567013461.tar.bz2
nixpkgs-5efb7d8d19aa468315aef06213d3f89567013461.tar.lz
nixpkgs-5efb7d8d19aa468315aef06213d3f89567013461.tar.xz
nixpkgs-5efb7d8d19aa468315aef06213d3f89567013461.tar.zst
nixpkgs-5efb7d8d19aa468315aef06213d3f89567013461.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index f874762267a..fda2881a8d2 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -119,7 +119,7 @@ let
         # This way kernels can be bit-by-bit reproducible depending on settings
         # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled).
         # See also https://kernelnewbies.org/BuildId
-        sed -i Makefile -e 's|--build-id|--build-id=none|'
+        sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|'
 
         patchShebangs scripts/ld-version.sh
       '';