diff options
| author | Masum Reza <50095635+JohnRTitor@users.noreply.github.com> | 2024-06-23 09:34:24 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-23 09:34:24 +0530 |
| commit | 1b77bc24c5a733f6812bcf7809eb8da59c4ba4d6 (patch) | |
| tree | 69df65d1eb8a8d99c60989f276fdd23cb8495070 /pkgs/os-specific | |
| parent | 8d752c01322da4cef77e67e1864be24ec577773b (diff) | |
| parent | 16e8400968a1d1d027f298bc1e4851cefc7b1700 (diff) | |
Merge pull request #277975 from jmbaur/linux-kernel-efi-zboot
linux: handle case where ZBOOT EFI stub is the target
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 323b77e851404..5f20d14137c4b 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod, ubootTools +, cpio, elfutils, hexdump, zstd, python3Minimal, zlib, pahole, kmod, ubootTools , fetchpatch , rustc, rust-bindgen, rustPlatform }: @@ -121,6 +121,7 @@ let pahole perl elfutils + hexdump # module makefiles often run uname commands to find out the kernel version (buildPackages.deterministic-uname.override { inherit modDirVersion; }) ] @@ -312,7 +313,7 @@ let installTargets = [ (kernelConf.installTarget or ( /**/ if kernelConf.target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then "uinstall" - else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall" + else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" || kernelConf.target == "vmlinuz.efi" then "zinstall" else "install")) ]; |