diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-14 16:27:54 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-10-29 13:23:10 -0700 |
| commit | e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a (patch) | |
| tree | 49445c8958dcec83c04de893a777cea6de475e7a /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | 9a002bac35485425aa246e7f7398e19913f67553 (diff) | |
| download | nixpkgs-e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a.tar nixpkgs-e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a.tar.gz nixpkgs-e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a.tar.bz2 nixpkgs-e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a.tar.lz nixpkgs-e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a.tar.xz nixpkgs-e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a.tar.zst nixpkgs-e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a.zip | |
linuxPackages_5_10_hardened: fix patching conflict with patchShebang
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d9a959c50bc..421b234b634 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -126,7 +126,11 @@ let # See also https://kernelnewbies.org/BuildId sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|' - patchShebangs scripts + # Some linux-hardened patches now remove certain files in the scripts directory, so we cannot + # patch all scripts until after patches are applied. + # However, scripts/ld-version.sh is still ran when generating a configfile for a kernel, so it needs + # to be patched prior to patchPhase + patchShebangs scripts/ld-version.sh ''; postPatch = '' @@ -140,6 +144,8 @@ let --replace NIXOS_RANDSTRUCT_SEED \ $(echo ${randstructSeed}${src} ${configfile} | sha256sum | cut -d ' ' -f 1 | tr -d '\n') fi + + patchShebangs scripts ''; configurePhase = '' |