summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2017-06-26 10:08:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 19:55:08 (GMT)
commitd8f13c2649ed42458c07cb86bf451fbcd49ad19d (patch)
treedb40043710e71c4b20ae7c44ed903b9fbec44e16 /meta/recipes-connectivity/connman
parentaec7969f491b79f02c7c318830ddcf79ecb9ea1b (diff)
downloadpoky-d8f13c2649ed42458c07cb86bf451fbcd49ad19d.tar.gz
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. (From OE-Core rev: ed6c92d62be1c98ec9dbf92317d850499d127631) Signed-off-by: André Draszik <adraszik@tycoint.com> Acked-by: Sylvain Lemieux <slemieux@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc2
1 files changed, 1 insertions, 1 deletions
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
51PACKAGECONFIG[pptp] = "--enable-pptp --with-pptp=${sbindir}/pptp,--disable-pptp,,pptp-linux" 51PACKAGECONFIG[pptp] = "--enable-pptp --with-pptp=${sbindir}/pptp,--disable-pptp,,pptp-linux"
52# WISPr support for logging into hotspots, requires TLS 52# WISPr support for logging into hotspots, requires TLS
53PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls," 53PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls,"
54PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,nftables,nftables" 54PACKAGECONFIG[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"
55PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables" 55PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables"
56 56
57INITSCRIPT_NAME = "connman" 57INITSCRIPT_NAME = "connman"