ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

linux_testing: 4.10-rc7 -> 4.11-rc1

Browse Source 
Some config options got removed, so conditionalize them.
This commit is contained in:
Tuomas Tynkkynen 2017-03-11 01:19:34 +02:00
parent b52af49d36
commit 77c49794cd
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,17 +32,20 @@ with stdenv.lib;
# Debugging. # Debugging.
DEBUG_KERNEL y DEBUG_KERNEL y
DYNAMIC_DEBUG y DYNAMIC_DEBUG y
TIMER_STATS y
BACKTRACE_SELF_TEST n BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n CPU_NOTIFIER_ERROR_INJECT? n
DEBUG_DEVRES n DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n RCU_TORTURE_TEST n
SCHEDSTATS n SCHEDSTATS n
DETECT_HUNG_TASK y DETECT_HUNG_TASK y
${optionalString (versionOlder version "4.11") ''
TIMER_STATS y
DEBUG_NX_TEST n
''}
# Bump the maximum number of CPUs to support systems like EC2 x1.* # Bump the maximum number of CPUs to support systems like EC2 x1.*
# instances and Xeon Phi. # instances and Xeon Phi.
${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") '' ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") ''

8
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.10-rc7"; version = "4.11-rc1";
modDirVersion = "4.10.0-rc7"; modDirVersion = "4.11.0-rc1";
extraMeta.branch = "4.10"; 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 = "01jq4bxb8jcnawhsklc9aa2ba9sg7k5g97jp0slpbi8xw71dripl"; sha256 = "19zcyjqiw255d48k1mk33i1wgbiwv58nn3dw9i9079hfb843s28l";
}; };
features.iwlwifi = true; features.iwlwifi = true;

1
pkgs/top-level/all-packages.nix
View File

@ -11483,7 +11483,6 @@ with pkgs;
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill kernelPatches.mips_fpu_sigill