ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-11 15:33:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

iptables: fix libnftnl/IPTABLES_NFTABLES dependency

Browse Source 
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>
This commit is contained in:
Etienne Champetier 2022-02-26 19:22:59 -05:00 committed by Hauke Mehrtens
parent fb2801b82c
commit 50d3271966
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/network/utils/iptables/Makefile
View File

@ -112,7 +112,7 @@ endef
define Package/iptables-nft define Package/iptables-nft
$(call Package/iptables/Default) $(call Package/iptables/Default)
TITLE:=IP firewall administration tool nft 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:=\ ALTERNATIVES:=\
300:/usr/sbin/iptables:/usr/sbin/xtables-nft-multi \ 300:/usr/sbin/iptables:/usr/sbin/xtables-nft-multi \
300:/usr/sbin/iptables-restore:/usr/sbin/xtables-nft-multi \ 300:/usr/sbin/iptables-restore:/usr/sbin/xtables-nft-multi \
@ -527,9 +527,7 @@ define Package/libxtables
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=IPv4/IPv6 firewall - shared xtables library TITLE:=IPv4/IPv6 firewall - shared xtables library
ABI_VERSION:=12 ABI_VERSION:=12
DEPENDS:= \ DEPENDS:=+IPTABLES_CONNLABEL:libnetfilter-conntrack
+IPTABLES_CONNLABEL:libnetfilter-conntrack \
+IPTABLES_NFTABLES:libnftnl
endef endef
define Package/libxtables-nft define Package/libxtables-nft
@ -538,7 +536,7 @@ define Package/libxtables-nft
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=IPv4/IPv6 firewall - shared xtables nft library TITLE:=IPv4/IPv6 firewall - shared xtables nft library
ABI_VERSION:=12 ABI_VERSION:=12
DEPENDS:=+libxtables DEPENDS:=@IPTABLES_NFTABLES +libxtables
endef endef
TARGET_CPPFLAGS := \ TARGET_CPPFLAGS := \