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

linux: 4.11-rc2 -> 4.11-rc3

Browse Source
This commit is contained in:
Tim Steinbach 2017-03-21 20:30:37 -04:00
parent 693d0e7fea
commit c60102d177
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@ with stdenv.lib;
DEBUG_KERNEL y DEBUG_KERNEL y
DYNAMIC_DEBUG y DYNAMIC_DEBUG y
BACKTRACE_SELF_TEST n BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n
DEBUG_DEVRES n DEBUG_DEVRES n
DEBUG_STACK_USAGE n DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n DEBUG_STACKOVERFLOW n
@ -41,6 +40,10 @@ with stdenv.lib;
SCHEDSTATS n SCHEDSTATS n
DETECT_HUNG_TASK y DETECT_HUNG_TASK y
${optionalString (versionOlder version "4.10") ''
CPU_NOTIFIER_ERROR_INJECT? n
''}
${optionalString (versionOlder version "4.11") '' ${optionalString (versionOlder version "4.11") ''
TIMER_STATS y TIMER_STATS y
DEBUG_NX_TEST n DEBUG_NX_TEST n
@ -308,7 +311,9 @@ with stdenv.lib;
NLS_ISO8859_1 m # VFAT default for the iocharset= mount option NLS_ISO8859_1 m # VFAT default for the iocharset= mount option
# Runtime security tests # Runtime security tests
DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages ${optionalString (versionOlder version "4.11") ''
DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages
''}
# Security related features. # Security related features.
RANDOMIZE_BASE? y RANDOMIZE_BASE? y
@ -456,7 +461,11 @@ with stdenv.lib;
FTRACE_SYSCALLS y FTRACE_SYSCALLS y
SCHED_TRACER y SCHED_TRACER y
STACK_TRACER y STACK_TRACER y
UPROBE_EVENT? y
${optionalString (versionOlder version "4.11") ''
UPROBE_EVENT? y
''}
${optionalString (versionAtLeast version "4.4") '' ${optionalString (versionAtLeast version "4.4") ''
BPF_SYSCALL y BPF_SYSCALL y
BPF_EVENTS y BPF_EVENTS y

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.11-rc2"; version = "4.11-rc3";
modDirVersion = "4.11.0-rc2"; modDirVersion = "4.11.0-rc3";
extraMeta.branch = "4.11"; extraMeta.branch = "4.11";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "1rfdnx7klrb8z9372ydmrsw6bk3i6xqa0am3vjqy75mjp54063vx"; sha256 = "07y54bl2i4qsz36hwbp3k56k8hzjyvs82cimrg0hnp2xca537vxz";
}; };
features.iwlwifi = true; features.iwlwifi = true;