diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-05-23 09:19:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-05-23 09:19:42 +0000 |
| commit | fa7ae8876f0b6bd05262a6be12ccd1fc551ed25d (patch) | |
| tree | 4c7ab711b72fff0d1eab79ddff8cd858bc62027b /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 26e7906a969db1b2e44ca9125b985ca38c039597 (diff) | |
| download | nixpkgs-fa7ae8876f0b6bd05262a6be12ccd1fc551ed25d.tar nixpkgs-fa7ae8876f0b6bd05262a6be12ccd1fc551ed25d.tar.gz nixpkgs-fa7ae8876f0b6bd05262a6be12ccd1fc551ed25d.tar.bz2 nixpkgs-fa7ae8876f0b6bd05262a6be12ccd1fc551ed25d.tar.lz nixpkgs-fa7ae8876f0b6bd05262a6be12ccd1fc551ed25d.tar.xz nixpkgs-fa7ae8876f0b6bd05262a6be12ccd1fc551ed25d.tar.zst nixpkgs-fa7ae8876f0b6bd05262a6be12ccd1fc551ed25d.zip | |
linux_latest: 5.17.9 -> 5.18
NSFD_V3 is now always enabled, and enabling debug info now requires selecting a DWARF version instead of just setting DEBUG_INFO=y.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d25e20bac8b..76f8122e477 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -38,8 +38,9 @@ let # Necessary for BTF DEBUG_INFO = mkMerge [ (whenOlder "5.2" (if (features.debug or false) then yes else no)) - (whenAtLeast "5.2" yes) + (whenBetween "5.2" "5.18" yes) ]; + DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes; DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); BPF_LSM = whenAtLeast "5.7" (option yes); DEBUG_KERNEL = yes; @@ -407,7 +408,7 @@ let UDF_FS = module; NFSD_V2_ACL = yes; - NFSD_V3 = yes; + NFSD_V3 = whenOlder "5.18" yes; NFSD_V3_ACL = yes; NFSD_V4 = yes; NFSD_V4_SECURITY_LABEL = yes; |