[oe-commits] [openembedded-core] 18/28: connman: fix nftables dependency

git at git.openembedded.org git at git.openembedded.org
Wed Jun 28 19:56:22 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit ed6c92d62be1c98ec9dbf92317d850499d127631
Author: André Draszik <adraszik at tycoint.com>
AuthorDate: Mon Jun 26 11:08:46 2017 +0100

    connman: fix nftables dependency
    
    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.
    
    Signed-off-by: André Draszik <adraszik at tycoint.com>
    Acked-by: Sylvain Lemieux <slemieux at tycoint.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-connectivity/connman/connman.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 7e05c80..6c8f405 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list