Merge remote-tracking branch 'origin/master' into hardened-stdenv

This commit is contained in:
Franz Pletz
2016-05-18 17:10:02 +02:00
1470 changed files with 62103 additions and 28701 deletions
@@ -109,6 +109,7 @@ let
buildFlags = [
"KBUILD_BUILD_VERSION=1-NixOS"
platform.kernelTarget
"vmlinux" # for "perf" and things like that
] ++ optional isModular "modules";
installFlags = [
@@ -122,10 +123,13 @@ let
if platform.kernelTarget == "zImage" then "zinstall" else
"install") ];
postInstall = (optionalString installsFirmware ''
postInstall = ''
mkdir -p $dev
cp $buildRoot/vmlinux $dev/
'' + (optionalString installsFirmware ''
mkdir -p $out/lib/firmware
'') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
make $makeFlags "''${makeFlagsArray[@]}" dtbs
make $makeFlags "''${makeFlagsArray[@]}" dtbs
mkdir -p $out/dtbs
cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs
'' else "") + (if isModular then ''
@@ -190,6 +194,8 @@ let
$installFlags "''${installFlagsArray[@]}"
'');
requiredSystemFeatures = [ "big-parallel" ];
meta = {
description =
"The Linux kernel" +