diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-27 02:18:44 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-27 02:18:44 +0200 |
| commit | be0e48e48f1f10db87f522c9c088f7d07dc1ccae (patch) | |
| tree | 1b0d85fbba27adc44101ad4847cf816e5c106193 /pkgs/os-specific/linux/kernel | |
| parent | 972749f1d423c5682faf5cd40fe3458bdcbb8cab (diff) | |
| parent | 2f367e0af714bb6e7abcd3b79d7bd31bd946a3d3 (diff) | |
| download | nixpkgs-be0e48e48f1f10db87f522c9c088f7d07dc1ccae.tar nixpkgs-be0e48e48f1f10db87f522c9c088f7d07dc1ccae.tar.gz nixpkgs-be0e48e48f1f10db87f522c9c088f7d07dc1ccae.tar.bz2 nixpkgs-be0e48e48f1f10db87f522c9c088f7d07dc1ccae.tar.lz nixpkgs-be0e48e48f1f10db87f522c9c088f7d07dc1ccae.tar.xz nixpkgs-be0e48e48f1f10db87f522c9c088f7d07dc1ccae.tar.zst nixpkgs-be0e48e48f1f10db87f522c9c088f7d07dc1ccae.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 44e4ebe1748..40c49509fd0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -45,7 +45,7 @@ with stdenv.lib; # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. - ${optionalString (stdenv.system == "x86_64-linux") '' + ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") '' NR_CPUS 384 ''} diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 5f890b9b9fe..83020ad35a2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -120,7 +120,7 @@ let # Some image types need special install targets (e.g. uImage is installed with make uinstall) installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else - if platform.kernelTarget == "zImage" then "zinstall" else + if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else "install") ]; postInstall = '' |