From 65a87eee9cc1c8e3985389333903ae08bba6ad95 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 25 May 2024 08:03:58 -0700 Subject: [PATCH] linux: use uinstall for all arm architectures The uinstall target is valid anytime ARCH=arm, not just for armv7, we can use `stdenv.hostPlatform.linuxArch` to match this properly. --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index caf8f11ca437..0c176d3e12d9 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -304,7 +304,7 @@ let # Some image types need special install targets (e.g. uImage is installed with make uinstall on arm) installTargets = [ (kernelConf.installTarget or ( - /**/ if kernelConf.target == "uImage" && stdenv.hostPlatform.isArmv7 then "uinstall" + /**/ if kernelConf.target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then "uinstall" else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall" else "install")) ];