diff options
author | Maxin B. John <maxin.john@intel.com> | 2017-05-08 14:46:57 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-23 17:45:36 +0100 |
commit | 29c426b8860b3a8eaf0e7862875a756ec7cc25bf (patch) | |
tree | 40c48ebd1bbdf245e51f19050b97e227e31307b4 /meta/recipes-connectivity/connman/connman.inc | |
parent | 1fe39e849299a720ab0bcace7d6d8325e6cd8193 (diff) | |
download | poky-29c426b8860b3a8eaf0e7862875a756ec7cc25bf.tar.gz |
connman: upgrade to 1.34
1.33 -> 1.34
1. Refreshed 0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch
2. Removed upstreamed patch:
0003-stats-Fix-bad-file-descriptor-initialisation.patch
3. Provided PACKAGECONFIGs for nftables and iptables support
4. Add new patch to fix build with nftables:
0001-firewall-nftables-fix-build-with-libnftnl-1.0.7.patch
(From OE-Core rev: dfe40b7abbea36605e4ea8f74ec8e477505148a6)
Signed-off-by: Maxin B. John <maxin.john@intel.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/connman.inc')
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 64a5418c63..cc2d46935d 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | |||
15 | 15 | ||
16 | inherit autotools pkgconfig systemd update-rc.d bluetooth | 16 | inherit autotools pkgconfig systemd update-rc.d bluetooth |
17 | 17 | ||
18 | DEPENDS = "dbus glib-2.0 ppp iptables readline" | 18 | DEPENDS = "dbus glib-2.0 ppp readline" |
19 | 19 | ||
20 | INC_PR = "r20" | 20 | INC_PR = "r20" |
21 | 21 | ||
@@ -33,6 +33,7 @@ EXTRA_OECONF += "\ | |||
33 | PACKAGECONFIG ??= "wispr \ | 33 | PACKAGECONFIG ??= "wispr \ |
34 | ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \ | 34 | ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \ |
35 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ | 35 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ |
36 | iptables \ | ||
36 | " | 37 | " |
37 | 38 | ||
38 | # If you want ConnMan to support VPN, add following statement into | 39 | # If you want ConnMan to support VPN, add following statement into |
@@ -50,6 +51,8 @@ PACKAGECONFIG[l2tp] = "--enable-l2tp --with-l2tp=${sbindir}/xl2tpd,--disable-l2t | |||
50 | PACKAGECONFIG[pptp] = "--enable-pptp --with-pptp=${sbindir}/pptp,--disable-pptp,,pptp-linux" | 51 | PACKAGECONFIG[pptp] = "--enable-pptp --with-pptp=${sbindir}/pptp,--disable-pptp,,pptp-linux" |
51 | # WISPr support for logging into hotspots, requires TLS | 52 | # WISPr support for logging into hotspots, requires TLS |
52 | PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls," | 53 | PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls," |
54 | PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,nftables,nftables" | ||
55 | PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables" | ||
53 | 56 | ||
54 | INITSCRIPT_NAME = "connman" | 57 | INITSCRIPT_NAME = "connman" |
55 | INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." | 58 | INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." |