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

Merge branch 'staging' into staging-next

Browse Source 
A few conflicts but relatively clear ones (I think).
This commit is contained in:
Vladimír Čunát
2021-04-14 10:08:25 +02:00
parent 3257feac49 25ae1fd29f
commit d2eb7a7887
675 changed files with 5919 additions and 3687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/common-config.nix
+8 -13
View File
@@ -12,7 +12,7 @@
# Configuration
{ lib, stdenv, version
, features ? { grsecurity = false; xen_dom0 = false; }
, features ? {}
}:
with lib;
@@ -42,7 +42,7 @@ let
TIMER_STATS = whenOlder "4.11" yes;
DEBUG_NX_TEST = whenOlder "4.11" no;
DEBUG_STACK_USAGE = no;
DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) (option no);
DEBUG_STACKOVERFLOW = option no;
RCU_TORTURE_TEST = no;
SCHEDSTATS = no;
DETECT_HUNG_TASK = yes;
@@ -443,7 +443,7 @@ let
SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default
# Prevent processes from ptracing non-children processes
SECURITY_YAMA = option yes;
DEVKMEM = mkIf (!features.grsecurity) no; # Disable /dev/kmem
DEVKMEM = no; # Disable /dev/kmem
USER_NS = yes; # Support for user namespaces
@@ -523,7 +523,7 @@ let
virtualisation = {
PARAVIRT = option yes;
HYPERVISOR_GUEST = mkIf (!features.grsecurity) yes;
HYPERVISOR_GUEST = yes;
PARAVIRT_SPINLOCKS = option yes;
KVM_APIC_ARCHITECTURE = whenOlder "4.8" yes;
@@ -531,7 +531,7 @@ let
KVM_COMPAT = { optional = true; tristate = whenBetween "4.0" "4.12" "y"; };
KVM_DEVICE_ASSIGNMENT = { optional = true; tristate = whenBetween "3.10" "4.12" "y"; };
KVM_GENERIC_DIRTYLOG_READ_PROTECT = whenAtLeast "4.0" yes;
KVM_GUEST = mkIf (!features.grsecurity) yes;
KVM_GUEST = yes;
KVM_MMIO = yes;
KVM_VFIO = yes;
KSM = yes;
@@ -547,13 +547,8 @@ let
VBOXGUEST = option no;
DRM_VBOXVIDEO = option no;
} // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
XEN = option yes;
# XXX: why isn't this in the xen-dom0 conditional section below?
XEN_DOM0 = option yes;
} // optionalAttrs features.xen_dom0 {
XEN = option yes;
XEN_DOM0 = option yes;
PCI_XEN = option yes;
HVC_XEN = option yes;
HVC_XEN_FRONTEND = option yes;
@@ -572,7 +567,7 @@ let
XEN_SELFBALLOONING = option yes;
XEN_STUB = option yes;
XEN_TMEM = option yes;
});
};
media = {
MEDIA_DIGITAL_TV_SUPPORT = yes;
pkgs/os-specific/linux/kernel/generic.nix
+2 -4
View File
@@ -46,7 +46,6 @@
stdenv.hostPlatform != stdenv.buildPlatform
, extraMeta ? {}
, isXen ? features.xen_dom0 or false
, isZen ? false
, isLibre ? false
, isHardened ? false
@@ -73,8 +72,6 @@ let
efiBootStub = true;
needsCifsUtils = true;
netfilterRPFilter = true;
grsecurity = false;
xen_dom0 = false;
ia32Emulation = true;
} // features) kernelPatches;
@@ -178,7 +175,8 @@ let
passthru = {
features = kernelFeatures;
inherit commonStructuredConfig isXen isZen isHardened isLibre modDirVersion;
inherit commonStructuredConfig isZen isHardened isLibre modDirVersion;
isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version;
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
pkgs/os-specific/linux/kernel/manual-config.nix
+2 -2
View File
@@ -37,7 +37,6 @@ in {
extraMeta ? {},
# for module compatibility
isXen ? features.xen_dom0 or false,
isZen ? false,
isLibre ? false,
isHardened ? false,
@@ -94,7 +93,8 @@ let
passthru = {
inherit version modDirVersion config kernelPatches configfile
moduleBuildDependencies stdenv;
inherit isXen isZen isHardened isLibre;
inherit isZen isHardened isLibre;
isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version;
};