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

linux/common-config: fix fallout from #293302 

- NVME_AUTH must be module if NVME_CORE is module on 6.7+
- NVME_TARGET_PASSTHRU is spelled differently, and does not exist before 5.9
- PCI_P2PDMA does not exist before 4.20
This commit is contained in:
K900 2024-04-17 20:36:14 +03:00
parent d205596f17
commit 72bd0d6b1a
1 changed files with 7 additions and 3 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

@ -1053,16 +1053,20 @@ let
NVME_MULTIPATH = yes;
NVME_AUTH = whenAtLeast "6.0" yes;
NVME_AUTH = mkMerge [
(whenBetween "6.0" "6.7" yes)
(whenAtLeast "6.7" module)
];
NVME_HOST_AUTH = whenAtLeast "6.7" yes;
NVME_TCP_TLS = whenAtLeast "6.7" yes;
NVME_TARGET = module;
NVME_TARGET_PASSTHROUGH = whenAtLeast "5.1" yes;
NVME_TARGET_PASSTHRU = whenAtLeast "5.9" yes;
NVME_TARGET_AUTH = whenAtLeast "6.0" yes;
NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes;
PCI_P2PDMA = mkIf stdenv.hostPlatform.is64bit yes;
PCI_P2PDMA = mkIf (stdenv.hostPlatform.is64bit && versionAtLeast version "4.20") yes;
PSI = whenAtLeast "4.20" yes;