diff options
author | Philipp Steinpass <philipp@xndr.de> | 2017-11-28 00:15:48 +0100 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-28 15:19:23 +0200 |
commit | e8fcced76e7f076340cd742c7179b5f4d32f079c (patch) | |
tree | 41f0b24c47cf14e1c68bc38838d5d30cd6438ba9 /pkgs/os-specific/linux/kernel | |
parent | acbaefa6156b67ecbb2cd3d5d65787d21790b815 (diff) | |
download | nixlib-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar nixlib-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.gz nixlib-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.bz2 nixlib-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.lz nixlib-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.xz nixlib-e8fcced76e7f076340cd742c7179b5f4d32f079c.tar.zst nixlib-e8fcced76e7f076340cd742c7179b5f4d32f079c.zip |
linux-testing: 4.14-rc8 -> 4.15-rc1
Closes #32137
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 54e37e721303..3fe9ff8e2870 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc8"; - modDirVersion = "4.14.0-rc8"; - extraMeta.branch = "4.14"; + version = "4.15-rc1"; + modDirVersion = "4.15.0-rc1"; + extraMeta.branch = "4.15"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0ir2ggflm1xjnn1kvv2c99m5zni5kg0ygzlpm588wnhkzd93nqjh"; + sha256 = "1l7c132qb5qjd80hga03ivssfq65brqyd95sb4rd065dqrixp20n"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b0735e94619d..b4ee23079d93 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -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" ]; |