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

kernel: fix errors in configuration 

With the fix in kernel configuration merging, some kernel configuration items
marked as mandatory now correctly trigger an error when unused (while they
previously were unused).
This commit is contained in:
Matthieu Coudron 2020-04-01 22:25:21 +02:00
parent b9a4e6953d
commit 121b17e1ac
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ let
TIMER_STATS = whenOlder "4.11" yes; TIMER_STATS = whenOlder "4.11" yes;
DEBUG_NX_TEST = whenOlder "4.11" no; DEBUG_NX_TEST = whenOlder "4.11" no;
DEBUG_STACK_USAGE = no; DEBUG_STACK_USAGE = no;
DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) no; DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) (option no);
RCU_TORTURE_TEST = no; RCU_TORTURE_TEST = no;
SCHEDSTATS = no; SCHEDSTATS = no;
DETECT_HUNG_TASK = yes; DETECT_HUNG_TASK = yes;
@ -179,7 +179,7 @@ let
# needed for ss # needed for ss
INET_DIAG = yes; INET_DIAG = yes;
INET_TCP_DIAG = module; INET_TCP_DIAG = option module;
INET_UDP_DIAG = module; INET_UDP_DIAG = module;
INET_RAW_DIAG = whenAtLeast "4.14" module; INET_RAW_DIAG = whenAtLeast "4.14" module;
INET_DIAG_DESTROY = whenAtLeast "4.9" yes; INET_DIAG_DESTROY = whenAtLeast "4.9" yes;
@ -337,7 +337,7 @@ let
CIFS_STATS = whenOlder "4.19" yes; CIFS_STATS = whenOlder "4.19" yes;
CIFS_WEAK_PW_HASH = yes; CIFS_WEAK_PW_HASH = yes;
CIFS_UPCALL = yes; CIFS_UPCALL = yes;
CIFS_ACL = yes; CIFS_ACL = option yes;
CIFS_DFS_UPCALL = yes; CIFS_DFS_UPCALL = yes;
CIFS_SMB2 = whenOlder "4.13" yes; CIFS_SMB2 = whenOlder "4.13" yes;
@ -368,7 +368,7 @@ let
DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; };
RANDOMIZE_BASE = option yes; RANDOMIZE_BASE = option yes;
STRICT_DEVMEM = option yes; # Filter access to /dev/mem STRICT_DEVMEM = option yes; # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE = freeform "0"; # Disable SELinux by default SECURITY_SELINUX_BOOTPARAM_VALUE = option (freeform "0"); # Disable SELinux by default
# Prevent processes from ptracing non-children processes # Prevent processes from ptracing non-children processes
SECURITY_YAMA = option yes; SECURITY_YAMA = option yes;
DEVKMEM = mkIf (!features.grsecurity) no; # Disable /dev/kmem DEVKMEM = mkIf (!features.grsecurity) no; # Disable /dev/kmem
@ -676,7 +676,7 @@ let
KEXEC_JUMP = option yes; KEXEC_JUMP = option yes;
# Windows Logical Disk Manager (Dynamic Disk) support # Windows Logical Disk Manager (Dynamic Disk) support
LDM_PARTITION = yes; LDM_PARTITION = option yes;
LOGIRUMBLEPAD2_FF = yes; # Logitech Rumblepad 2 force feedback LOGIRUMBLEPAD2_FF = yes; # Logitech Rumblepad 2 force feedback
LOGO = no; # not needed LOGO = no; # not needed
MEDIA_ATTACH = yes; MEDIA_ATTACH = yes;