linux: handle case where ZBOOT EFI stub is the target#277975
linux: handle case where ZBOOT EFI stub is the target#277975JohnRTitor merged 1 commit intoNixOS:stagingfrom
Conversation
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/3216 |
bbd576e to
410418f
Compare
410418f to
0c7f4a6
Compare
a192982 to
0bb71f2
Compare
|
Sorry for the churn, forgot this was targeting staging and had rebased on master, should be fixed now. |
|
@alyssais any chance you'd be able to merge this one? I'm pretty sure amjoseph used to maintain the linux derivations, so there's no maintainer here to merge this anymore. |
|
Hello, could you rebase this? |
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.
0bb71f2 to
16e8400
Compare
JohnRTitor
left a comment
There was a problem hiding this comment.
Ok lets merge this one after CI passes green
What makes you think that? There were even people pinged by ofborg because there's a maintainer team for the kernel. The sole problem - in my case - is that I just didn't have the time so far to take a look. |
|
@Ma27 sorry the history looks kinda weird! I accidentally rebased this PR on master, when it was targeted at staging, so it pulled in a few unrelated files which then pulled in the maintainers for those files. IIRC, the only original reviewer that got pulled in was amjoseph. |
| pahole | ||
| perl | ||
| elfutils | ||
| hexdump |
There was a problem hiding this comment.
I tried building vmlinuz.efi on aarch64. This is actually wrong here since it needs to be put in nativeBuildInputs.
Trying to build vmlinuz.efi natively on aarch64 fails to find hexdump. This was introduced in NixOS#277975. Moving hexdump to nativeBuildInputs fixes the build.
Description of changes
When CONFIG_EFI_ZBOOT is enabled in the linux kernel's config,
vmlinuz.efibecomes the file you want to install through thezinstallmake target. This also needs the hexdump tool during the build of the EFI image.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.