From: Etienne Champetier Date: Sun, 27 Feb 2022 00:22:59 +0000 (-0500) Subject: iptables: fix libnftnl/IPTABLES_NFTABLES dependency X-Git-Tag: v22.03.0-rc1~292 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=50d327196681f9514739355573e49db0ad151d6a;p=openwrt%2Fopenwrt.git iptables: fix libnftnl/IPTABLES_NFTABLES dependency libxtables doesn't depend on libnftnl, iptables-nft does, so move the dependency to not pull libnftnl with firewall3/iptables-legacy Also libxtables-nft depends on IPTABLES_NFTABLES Signed-off-by: Etienne Champetier --- diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index e936a57380..12021c21f1 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -112,7 +112,7 @@ endef define Package/iptables-nft $(call Package/iptables/Default) TITLE:=IP firewall administration tool nft - DEPENDS:=@IPTABLES_NFTABLES +libxtables-nft +libip4tc +IPV6:libip6tc +kmod-ipt-core +kmod-nft-compat + DEPENDS:=@IPTABLES_NFTABLES +libnftnl +libxtables-nft +libip4tc +IPV6:libip6tc +kmod-ipt-core +kmod-nft-compat ALTERNATIVES:=\ 300:/usr/sbin/iptables:/usr/sbin/xtables-nft-multi \ 300:/usr/sbin/iptables-restore:/usr/sbin/xtables-nft-multi \ @@ -527,9 +527,7 @@ define Package/libxtables CATEGORY:=Libraries TITLE:=IPv4/IPv6 firewall - shared xtables library ABI_VERSION:=12 - DEPENDS:= \ - +IPTABLES_CONNLABEL:libnetfilter-conntrack \ - +IPTABLES_NFTABLES:libnftnl + DEPENDS:=+IPTABLES_CONNLABEL:libnetfilter-conntrack endef define Package/libxtables-nft @@ -538,7 +536,7 @@ define Package/libxtables-nft CATEGORY:=Libraries TITLE:=IPv4/IPv6 firewall - shared xtables nft library ABI_VERSION:=12 - DEPENDS:=+libxtables + DEPENDS:=@IPTABLES_NFTABLES +libxtables endef TARGET_CPPFLAGS := \