From d8f13c2649ed42458c07cb86bf451fbcd49ad19d Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 26 Jun 2017 11:08:46 +0100 Subject: connman: fix nftables dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When building with nftables support, connman doesn't ever depend on the nftables command line tool. connman will depend on libmnl and libnftnl at build and run time. In addition, the nftables rules it creates depend on various kernel modules being present. Update the PACKAGECONFIG to reflect this. We use the just introduced RRECOMMENDS field so as to make the build still succeed if those kernel modules have been linked statically into the kernel, i.e. when the packages haven't actually been created. (From OE-Core rev: ed6c92d62be1c98ec9dbf92317d850499d127631) Signed-off-by: André Draszik Acked-by: Sylvain Lemieux Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 7e05c8017d..6c8f405a8a 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -51,7 +51,7 @@ PACKAGECONFIG[l2tp] = "--enable-l2tp --with-l2tp=${sbindir}/xl2tpd,--disable-l2t PACKAGECONFIG[pptp] = "--enable-pptp --with-pptp=${sbindir}/pptp,--disable-pptp,,pptp-linux" # WISPr support for logging into hotspots, requires TLS PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls," -PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,nftables,nftables" +PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables-ipv4 kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-meta kernel-module-nft-masq-ipv4 kernel-module-nft-nat" PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables" INITSCRIPT_NAME = "connman" -- cgit v1.2.3-54-g00ecf