Skip to content

linux: handle case where ZBOOT EFI stub is the target #277975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnRTitor merged 1 commit into from
Jun 23, 2024
Merged

linux: handle case where ZBOOT EFI stub is the target #277975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/os-specific/linux/kernel/manual-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}:
Expand Down Expand Up @@ -121,6 +121,7 @@ let
pahole
perl
elfutils
hexdump
Copy link
Member

@fpletz fpletz Jul 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried building vmlinuz.efi on aarch64. This is actually wrong here since it needs to be put in nativeBuildInputs.

# module makefiles often run uname commands to find out the kernel version
(buildPackages.deterministic-uname.override { inherit modDirVersion; })
]
Expand Down Expand Up @@ -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"))
];

Expand Down