public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-testing: 4.14-rc8 -> 4.15-rc1

Browse Source 
Closes #32137
This commit is contained in:
Philipp Steinpass
2017-11-28 15:19:23 +02:00
committed by Tuomas Tynkkynen
parent acbaefa615
commit e8fcced76e
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/manual-config.nix
+8 -1
View File
@@ -1,4 +1,6 @@
{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, libelf ? null
, utillinux ? null
, writeTextFile, ubootTools
, hostPlatform
}:
@@ -230,13 +232,18 @@ let
};
in
assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null;
assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // {
name = "linux-${version}";
enableParallelBuilding = true;
nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools;
++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.15") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];