[Nix-dev] [PATCH] Fixed zImage installation when building Linux.

2015-04-16 Thread Jookia 
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 ea29c7f..620df6d 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
-- 
2.3.3
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] [PATCH] Fixed zImage installation when building Linux.

2015-04-16 Thread Shea Levy 
Applied in 98d77cd1a57f3ff71d6ef36e727e339dd9cae233

 On Apr 16, 2015, at 5:32 PM, Jookia 166...@gmail.com wrote:
 
 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 ea29c7f..620df6d 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
 -- 
 2.3.3
 ___
 nix-dev mailing list
 nix-dev@lists.science.uu.nl
 http://lists.science.uu.nl/mailman/listinfo/nix-dev

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev