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

linux-testing: 4.17-rc7 -> 4.18-rc1

Browse Source
This commit is contained in:
Tim Steinbach 2018-06-16 20:33:00 -04:00
parent 3afc706c74
commit f85a82a647
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -368,7 +368,7 @@ with stdenv.lib;
${optionalString (! stdenv.hostPlatform.isAarch32) ${optionalString (! stdenv.hostPlatform.isAarch32)
(if versionOlder version "3.14" then '' (if versionOlder version "3.14" then ''
CC_STACKPROTECTOR? y # Detect buffer overflows on the stack CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
'' else '' '' else optionalString (versionOlder version "4.18") ''
CC_STACKPROTECTOR_REGULAR? y CC_STACKPROTECTOR_REGULAR? y
'')} '')}
${optionalString (versionAtLeast version "3.12") '' ${optionalString (versionAtLeast version "3.12") ''
@ -690,10 +690,12 @@ with stdenv.lib;
CRC32_SELFTEST? n CRC32_SELFTEST? n
CRYPTO_TEST? n CRYPTO_TEST? n
${optionalString (versionOlder version "4.18") ''
DRM_DEBUG_MM_SELFTEST? n DRM_DEBUG_MM_SELFTEST? n
LNET_SELFTEST? n
''}
EFI_TEST? n EFI_TEST? n
GLOB_SELFTEST? n GLOB_SELFTEST? n
LNET_SELFTEST? n
LOCK_TORTURE_TEST? n LOCK_TORTURE_TEST? n
MTD_TESTS? n MTD_TESTS? n
NOTIFIER_ERROR_INJECTION? n NOTIFIER_ERROR_INJECTION? n

8
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -1,13 +1,13 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.17-rc7"; version = "4.18-rc1";
modDirVersion = "4.17.0-rc7"; modDirVersion = "4.18.0-rc1";
extraMeta.branch = "4.17"; extraMeta.branch = "4.18";
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "0kibvll2h4wvfbfxral7jsjajaijw0jb0scpjascwh66d7cxbbbr"; sha256 = "1wzxnzhxmzn5gygxs1vm4iawknpivr5kn1mav8l1ll3q7s5xqjnr";
}; };
# Should the testing kernels ever be built on Hydra? # Should the testing kernels ever be built on Hydra?