Skip to content

Commit

Permalink
iptables: fix libnftnl/IPTABLES_NFTABLES dependency
Browse files Browse the repository at this point in the history
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 <champetier.etienne@gmail.com>
  • Loading branch information
champtar authored and hauke committed Feb 28, 2022
1 parent fb2801b commit 50d3271
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions package/network/utils/iptables/Makefile
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand All @@ -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 := \
Expand Down

0 comments on commit 50d3271

Please sign in to comment.