From 5252d8de783ae49c8c230cacddfe3a292d8ec304 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Tue, 22 Feb 2022 19:03:06 +0100 Subject: [PATCH] config: Move NFT_COUNTER into conditional (MR 2171) The option has been removed and is now always enabled with nftables core. See also https://git.kernel.org/torvalds/c/023223d --- 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 180f4d7c..399f73b2 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -422,7 +422,6 @@ necessary_kconfig_options_nftables = { "NF_TABLES": True, "NF_TABLES_INET": True, "NFT_CT": True, - "NFT_COUNTER": True, "NFT_LOG": True, "NFT_LIMIT": True, "NFT_MASQ": True, @@ -442,6 +441,11 @@ necessary_kconfig_options_nftables = { "IP6_NF_NAT": True, } }, + ">=3.13.0 <5.17_rc1": { # option has been dropped + "all": { # all arches + "NFT_COUNTER": True, + }, + }, } # Necessary kernel config options for containers (lxc, Docker)