From bc9f24cd516247866baf38dc0c42719d7eaffb41 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Fri, 24 May 2024 22:49:09 -0700 Subject: [PATCH] linux: only use uinstall when on armv7 The `uinstall` make target only exists for the armv7 architecture in linux source, we should not use it if we are not building for armv7. ``` $ rg uinstall arch/arm/Makefile 293:INSTALL_TARGETS = zinstall uinstall install 327: echo ' uinstall - Install U-Boot wrapped compressed kernel' ``` --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index cab04ad0c7d8..caf8f11ca437 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -301,10 +301,10 @@ let export HOME=${installkernel} ''; - # Some image types need special install targets (e.g. uImage is installed with make uinstall) + # 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" then "uinstall" + /**/ if kernelConf.target == "uImage" && stdenv.hostPlatform.isArmv7 then "uinstall" else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall" else "install")) ];