diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-06-16 20:33:00 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2018-06-16 20:37:15 -0400 |
| commit | f85a82a647e781001f8b7faf5a8148dd3306ae82 (patch) | |
| tree | 266d8225c5a3318b3cd36205d3cb3c227ed1f6d1 /pkgs/os-specific | |
| parent | 3afc706c74dc973a0779a0669e96226325aa2d7c (diff) | |
| download | nixlib-f85a82a647e781001f8b7faf5a8148dd3306ae82.tar nixlib-f85a82a647e781001f8b7faf5a8148dd3306ae82.tar.gz nixlib-f85a82a647e781001f8b7faf5a8148dd3306ae82.tar.bz2 nixlib-f85a82a647e781001f8b7faf5a8148dd3306ae82.tar.lz nixlib-f85a82a647e781001f8b7faf5a8148dd3306ae82.tar.xz nixlib-f85a82a647e781001f8b7faf5a8148dd3306ae82.tar.zst nixlib-f85a82a647e781001f8b7faf5a8148dd3306ae82.zip | |
linux-testing: 4.17-rc7 -> 4.18-rc1
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d1314431abe1..93732f1c6f84 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -368,7 +368,7 @@ with stdenv.lib; ${optionalString (! stdenv.hostPlatform.isAarch32) (if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack - '' else '' + '' else optionalString (versionOlder version "4.18") '' CC_STACKPROTECTOR_REGULAR? y '')} ${optionalString (versionAtLeast version "3.12") '' @@ -647,7 +647,7 @@ with stdenv.lib; X86_X2APIC y IRQ_REMAP y ''} - + # needed for iwd WPS support (wpa_supplicant replacement) ${optionalString (versionAtLeast version "4.7") '' KEY_DH_OPERATIONS y @@ -690,10 +690,12 @@ with stdenv.lib; CRC32_SELFTEST? n CRYPTO_TEST? n - DRM_DEBUG_MM_SELFTEST? n + ${optionalString (versionOlder version "4.18") '' + DRM_DEBUG_MM_SELFTEST? n + LNET_SELFTEST? n + ''} EFI_TEST? n GLOB_SELFTEST? n - LNET_SELFTEST? n LOCK_TORTURE_TEST? n MTD_TESTS? n NOTIFIER_ERROR_INJECTION? n diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4794685a7555..d1732af9f5eb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc7"; - modDirVersion = "4.17.0-rc7"; - extraMeta.branch = "4.17"; + version = "4.18-rc1"; + modDirVersion = "4.18.0-rc1"; + extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0kibvll2h4wvfbfxral7jsjajaijw0jb0scpjascwh66d7cxbbbr"; + sha256 = "1wzxnzhxmzn5gygxs1vm4iawknpivr5kn1mav8l1ll3q7s5xqjnr"; }; # Should the testing kernels ever be built on Hydra? |