diff options
| author | Tyler Slabinski <tslabinski@slabity.net> | 2023-02-02 15:54:46 -0500 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-02 23:29:18 +0000 |
| commit | f8f7820433f1abc7a0da38a49ab57448baca1ff2 (patch) | |
| tree | e5c5aabb42dfe460d9d043f96e88280ad47e8645 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 9711de7b7e46e44a74e584ab7733b5b1108c78f2 (diff) | |
| download | nixpkgs-f8f7820433f1abc7a0da38a49ab57448baca1ff2.tar nixpkgs-f8f7820433f1abc7a0da38a49ab57448baca1ff2.tar.gz nixpkgs-f8f7820433f1abc7a0da38a49ab57448baca1ff2.tar.bz2 nixpkgs-f8f7820433f1abc7a0da38a49ab57448baca1ff2.tar.lz nixpkgs-f8f7820433f1abc7a0da38a49ab57448baca1ff2.tar.xz nixpkgs-f8f7820433f1abc7a0da38a49ab57448baca1ff2.tar.zst nixpkgs-f8f7820433f1abc7a0da38a49ab57448baca1ff2.zip | |
linuxPackages_testing: remove unused options for 6.2
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2fee060932e..20679b3c951 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -283,7 +283,7 @@ let DRM_GMA500 = whenAtLeast "5.12" module; DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; - DRM_VMWGFX_FBCON = yes; + DRM_VMWGFX_FBCON = whenOlder "6.2" yes; # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -431,7 +431,7 @@ let F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; - NFSD_V2_ACL = yes; + NFSD_V2_ACL = whenOlder "6.2" yes; NFSD_V3 = whenOlder "5.18" yes; NFSD_V3_ACL = yes; NFSD_V4 = yes; @@ -457,7 +457,7 @@ let CEPH_FS_POSIX_ACL = yes; SQUASHFS_FILE_DIRECT = yes; - SQUASHFS_DECOMP_MULTI_PERCPU = yes; + SQUASHFS_DECOMP_MULTI_PERCPU = whenOlder "6.2" yes; SQUASHFS_XATTR = yes; SQUASHFS_ZLIB = yes; SQUASHFS_LZO = yes; @@ -502,8 +502,8 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG - RANDOM_TRUST_BOOTLOADER = whenAtLeast "5.4" yes; # allow the bootloader to seed the RNG + RANDOM_TRUST_CPU = whenOlder "6.2" (whenAtLeast "4.19" yes); # allow RDRAND to seed the RNG + RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules @@ -830,7 +830,7 @@ let EFI_STUB = yes; # EFI bootloader in the bzImage itself EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = - whenAtLeast "5.8" yes; # initrd kernel parameter for EFI + whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI CGROUPS = yes; # used by systemd FHANDLE = yes; # used by systemd SECCOMP = yes; # used by systemd >= 231 |