From 16e8400968a1d1d027f298bc1e4851cefc7b1700 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Wed, 5 Jun 2024 18:28:16 -0700 Subject: [PATCH] linux: handle case where ZBOOT EFI stub is the target When CONFIG_EFI_ZBOOT is enabled in the linux kernel's config, `vmlinuz.efi` becomes the file you want to install through the `zinstall` make target. This also needs the hexdump tool during the build of the EFI image. --- pkgs/os-specific/linux/kernel/manual-config.nix | 5 +++-- 1 file 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 323b77e85140..5f20d14137c4 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")) ];