diff options
| author | Jookia <166291@gmail.com> | 2015-04-17 07:32:24 +1000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-04-16 22:00:58 -0400 |
| commit | 98d77cd1a57f3ff71d6ef36e727e339dd9cae233 (patch) | |
| tree | 6bf81be457ad721dab193e83b2e5ea13def49551 /pkgs/os-specific | |
| parent | 32bd96342796b44d62c9282cba10f0f51a179d36 (diff) | |
| download | nixpkgs-98d77cd1a57f3ff71d6ef36e727e339dd9cae233.tar nixpkgs-98d77cd1a57f3ff71d6ef36e727e339dd9cae233.tar.gz nixpkgs-98d77cd1a57f3ff71d6ef36e727e339dd9cae233.tar.bz2 nixpkgs-98d77cd1a57f3ff71d6ef36e727e339dd9cae233.tar.lz nixpkgs-98d77cd1a57f3ff71d6ef36e727e339dd9cae233.tar.xz nixpkgs-98d77cd1a57f3ff71d6ef36e727e339dd9cae233.tar.zst nixpkgs-98d77cd1a57f3ff71d6ef36e727e339dd9cae233.zip | |
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.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index ea29c7f9e0c..620df6dd6cf 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 |