summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2024-07-03 20:09:08 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2024-07-04 12:02:04 +0200
commit4e33633b826582b8bae5e79759850229f5c2400e (patch)
tree293332513423e8243700137292767256d3a8ca90
parentlinux: handle case where ZBOOT EFI stub is the target (diff)
downloadnixpkgs-origin/master-fpletz.tar.gz
linux: restrict zboot to aarch64origin/master-fpletz
Enabling EFI_ZBOOT fails at least the x86 builds. More compatible archs can be added after testing.
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 713bf1626b27..745319069627 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1031,7 +1031,8 @@ let
EFI_STUB = yes; # EFI bootloader in the bzImage itself
EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER =
whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI
- EFI_ZBOOT = whenAtLeast "6.1" yes; # Generic compression support for EFI payloads
+ # Generic compression support for EFI payloads
+ EFI_ZBOOT = mkIf stdenv.hostPlatform.isAarch64 (whenAtLeast "6.1" yes);
CGROUPS = yes; # used by systemd
FHANDLE = yes; # used by systemd
SECCOMP = yes; # used by systemd >= 231