From d8f2f20186ca21465b66532d884ee260d05c540f Mon Sep 17 00:00:00 2001 From: Alexander Martinz Date: Mon, 24 Oct 2022 11:14:47 +0200 Subject: [PATCH] pmb.parse.kconfig: fix container check for kernels >= 6.1 (MR 2220) Kernel 6.1 dropped CONFIG_MEMCG_SWAP[1]. [1] - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e55b9f96860f6c6026cff97966a740576285e07b Signed-off-by: Alexander Martinz --- pmb/config/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index f63bfc69..676f218f 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -495,7 +495,6 @@ necessary_kconfig_options_containers = { ">=3.6": { "all": { # all arches "MEMCG": True, - "MEMCG_SWAP": True, "DM_THIN_PROVISIONING": True, # Storage Drivers }, "x86 x86_64": { # only for x86, x86_64 (and sparc64, ia64) @@ -503,6 +502,11 @@ necessary_kconfig_options_containers = { "CGROUP_HUGETLB": True, # Optional section } }, + ">=3.6 <6.1": { # option has been dropped + "all": { + "MEMCG_SWAP": True, + } + }, ">=3.7 <5.0": { "all": { "NF_NAT_IPV4": True, # Needed for lxc