[openwrt/openwrt] firewall4: drop kmod-ipt-nat from CONFLICTS

LEDE Commits lede-commits at lists.infradead.org
Thu Jan 6 05:09:09 PST 2022


stintel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/3d4acc34bb58131804c018271ada6a535d7405e2

commit 3d4acc34bb58131804c018271ada6a535d7405e2
Author: Stijn Tintel <stijn at linux-ipv6.be>
AuthorDate: Sat Nov 6 15:24:34 2021 +0200

    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 <stijn at linux-ipv6.be>
    Reviewed-by: Jo-Philipp Wich <jo at mein.io>
---
 package/network/config/firewall4/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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



More information about the lede-commits mailing list