From: Stijn Tintel Date: Sat, 6 Nov 2021 13:24:34 +0000 (+0200) Subject: firewall4: drop kmod-ipt-nat from CONFLICTS X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3d4acc34bb58131804c018271ada6a535d7405e2;p=openwrt%2Fstaging%2Fneocturne.git firewall4: drop kmod-ipt-nat from CONFLICTS The limitation of not being able to use iptables and nft nat at the same time exists only in kernels before 4.18. Signed-off-by: Stijn Tintel Reviewed-by: Jo-Philipp Wich --- diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile index a4f63a91ee..57af47062f 100644 --- a/package/network/config/firewall4/Makefile +++ b/package/network/config/firewall4/Makefile @@ -22,7 +22,7 @@ define Package/firewall4 CATEGORY:=Base system TITLE:=OpenWrt 4th gen firewall DEPENDS:=+ucode +ucode-mod-fs +ucode-mod-uci +ucode-mod-ubus +kmod-nft-core +kmod-nft-fib +kmod-nft-nat +kmod-nft-nat6 +nftables-json - CONFLICTS:=firewall kmod-ipt-nat + CONFLICTS:=firewall endef define Package/firewall4/description