connman: Mark iptables/nftables mutually incompatible

Only one of iptables or nftables can be specified, mark them mutually
incompatible. Drop the RDEPENDS on iptables from PACKAGECONFIG as its
libraries are automatically discovered on the main package, with only the
scripts required as part of iptables/ip6tables-test.

(From OE-Core rev: fa6772414b065f3f5481e328f182eecc971d2605)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan authored and Richard Purdie committed 2025-04-20 10:11:16 +01:00
1 parent a87078c423
commit 4c57a5d461
1 file changed
+3 -2
@@ -69,8 +69,8 @@ PACKAGECONFIG[l2tp] = "--enable-l2tp --with-l2tp=${sbindir}/xl2tpd,--disable-l2t
PACKAGECONFIG[pptp] = "--enable-pptp --with-pptp=${sbindir}/pptp,--disable-pptp,ppp,pptp-linux"
# WISPr support for logging into hotspots, requires TLS
PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls,"
PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-masq-ipv4 kernel-module-nft-nat"
PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables"
PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-masq-ipv4 kernel-module-nft-nat,iptables"
PACKAGECONFIG[iptables] = "--with-firewall=iptables,,iptables,,,nftables"
PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard"
PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
PACKAGECONFIG[wireguard] = "--enable-wireguard,--disable-wireguard,libmnl"
@@ -167,6 +167,7 @@ FILES:${PN}-tools = "${bindir}/wispr"
RDEPENDS:${PN}-tools = "${PN}"
FILES:${PN}-tests = "${bindir}/*-test"
RDEPENDS:${PN}-tests = "${@bb.utils.contains('PACKAGECONFIG', 'iptables', 'iptables', '', d)}"
FILES:${PN}-client = "${bindir}/connmanctl"
RDEPENDS:${PN}-client = "${PN}"