From 98d77cd1a57f3ff71d6ef36e727e339dd9cae233 Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Fri, 17 Apr 2015 07:32:24 +1000 Subject: [PATCH] Fixed zImage installation when building Linux. When building kernels outputting a zImage, the zImage wasn't correctly copied in to the installation. This broke the build process entirely, at least on my ARM machine. --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index ea29c7f9e0c8..620df6dd6cfb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -116,7 +116,9 @@ let ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; # Some image types need special install targets (e.g. uImage is installed with make uinstall) - installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else "install") ]; + installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else + if platform.kernelTarget == "zImage" then "zinstall" else + "install") ]; postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware