diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2016-01-12 18:20:31 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-17 11:32:20 +0000 |
| commit | dd329d28ab3f47c8b03563e88703f6b1c09ce72b (patch) | |
| tree | fff0f88d1fe479ee6fbeeb3e894226ba4c45353d /meta/recipes-connectivity | |
| parent | b2c1c48d90aa9a94f90836557856e0319ddcb524 (diff) | |
| download | openembedded-core-contrib-dd329d28ab3f47c8b03563e88703f6b1c09ce72b.tar.gz | |
connman: upgrade to 1.31
1.30 -> 1.31
Included newly introduced connman-wait-online service.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 14 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman_1.31.bb (renamed from meta/recipes-connectivity/connman/connman_1.30.bb) | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 76e61b4f12..856ba44897 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -43,7 +43,7 @@ PACKAGECONFIG ??= "wispr \ # local.conf or distro config # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp" -PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" +PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''" PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}" PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" @@ -68,6 +68,7 @@ python __anonymous () { SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" +SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup" do_compile_append() { @@ -156,11 +157,12 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${libdir}/connman/plugins \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ - ${datadir}/dbus-1/system-services/*" + ${datadir}/dbus-1/system-services/* \ + ${sysconfdir}/tmpfiles.d/connman_resolvconf.conf" FILES_${PN}-dev += "${libdir}/connman/*/*.la" -PACKAGES =+ "${PN}-vpn" +PACKAGES =+ "${PN}-vpn ${PN}-wait-online" SUMMARY_${PN}-vpn = "A daemon for managing VPN connections within embedded devices" DESCRIPTION_${PN}-vpn = "The ConnMan VPN provides a daemon for \ @@ -174,6 +176,12 @@ FILES_${PN}-vpn += "${sbindir}/connman-vpnd \ ${datadir}/dbus-1/system-services/net.connman.vpn.service \ ${systemd_unitdir}/system/connman-vpn.service" +SUMMARY_${PN}-wait-online = "A program that will return once ConnMan has connected to a network" +DESCRIPTION_${PN}-wait-online = "A service that can be enabled so that \ +the system waits until a network connection is established." +FILES_${PN}-wait-online += "${sbindir}/connmand-wait-online \ + ${systemd_unitdir}/system/connman-wait-online.service" + SUMMARY_${PN}-plugin-vpn-openvpn = "An OpenVPN plugin for ConnMan VPN" DESCRIPTION_${PN}-plugin-vpn-openvpn = "The ConnMan OpenVPN plugin uses openvpn client \ to create a VPN connection to OpenVPN server." diff --git a/meta/recipes-connectivity/connman/connman_1.30.bb b/meta/recipes-connectivity/connman/connman_1.31.bb index 7d65ac931c..7b6bcfb0b1 100644 --- a/meta/recipes-connectivity/connman/connman_1.30.bb +++ b/meta/recipes-connectivity/connman/connman_1.31.bb @@ -7,8 +7,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://0003-Fix-header-inclusions-for-musl.patch \ file://connman \ " -SRC_URI[md5sum] = "4a3efdbd6796922db9c6f66da57887fa" -SRC_URI[sha256sum] = "5c5e464bacc9c27ed4e7269fb9b5059f07947f5be26433b59212133663ffa991" +SRC_URI[md5sum] = "cb1c413fcc4f49430294bbd7a92f5f3c" +SRC_URI[sha256sum] = "88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2" RRECOMMENDS_${PN} = "connman-conf" |