summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-01-12 18:20:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:07 +0000
commitcd7910df1d8c0f8996fc1af0b372bfad23d58c34 (patch)
tree379ffd4c0879c4908a99d27cc7b14f3e20fd5223
parentb9169b7be21639ba9f5dfc86afdfa8027245c232 (diff)
downloadpoky-cd7910df1d8c0f8996fc1af0b372bfad23d58c34.tar.gz
connman: upgrade to 1.31
1.30 -> 1.31 Included newly introduced connman-wait-online service. (From OE-Core rev: dd329d28ab3f47c8b03563e88703f6b1c09ce72b) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc14
-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 \
43# local.conf or distro config 43# local.conf or distro config
44# PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp" 44# PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
45 45
46PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" 46PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''"
47PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" 47PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant"
48PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}" 48PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}"
49PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" 49PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono"
@@ -68,6 +68,7 @@ python __anonymous () {
68 68
69SYSTEMD_SERVICE_${PN} = "connman.service" 69SYSTEMD_SERVICE_${PN} = "connman.service"
70SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" 70SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
71SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service"
71SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup" 72SYSTEMD_WIRED_SETUP = "ExecStartPre=-${datadir}/connman/wired-setup"
72 73
73do_compile_append() { 74do_compile_append() {
@@ -156,11 +157,12 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
156 ${libdir}/connman/plugins \ 157 ${libdir}/connman/plugins \
157 ${sysconfdir} ${sharedstatedir} ${localstatedir} \ 158 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
158 ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ 159 ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \
159 ${datadir}/dbus-1/system-services/*" 160 ${datadir}/dbus-1/system-services/* \
161 ${sysconfdir}/tmpfiles.d/connman_resolvconf.conf"
160 162
161FILES_${PN}-dev += "${libdir}/connman/*/*.la" 163FILES_${PN}-dev += "${libdir}/connman/*/*.la"
162 164
163PACKAGES =+ "${PN}-vpn" 165PACKAGES =+ "${PN}-vpn ${PN}-wait-online"
164 166
165SUMMARY_${PN}-vpn = "A daemon for managing VPN connections within embedded devices" 167SUMMARY_${PN}-vpn = "A daemon for managing VPN connections within embedded devices"
166DESCRIPTION_${PN}-vpn = "The ConnMan VPN provides a daemon for \ 168DESCRIPTION_${PN}-vpn = "The ConnMan VPN provides a daemon for \
@@ -174,6 +176,12 @@ FILES_${PN}-vpn += "${sbindir}/connman-vpnd \
174 ${datadir}/dbus-1/system-services/net.connman.vpn.service \ 176 ${datadir}/dbus-1/system-services/net.connman.vpn.service \
175 ${systemd_unitdir}/system/connman-vpn.service" 177 ${systemd_unitdir}/system/connman-vpn.service"
176 178
179SUMMARY_${PN}-wait-online = "A program that will return once ConnMan has connected to a network"
180DESCRIPTION_${PN}-wait-online = "A service that can be enabled so that \
181the system waits until a network connection is established."
182FILES_${PN}-wait-online += "${sbindir}/connmand-wait-online \
183 ${systemd_unitdir}/system/connman-wait-online.service"
184
177SUMMARY_${PN}-plugin-vpn-openvpn = "An OpenVPN plugin for ConnMan VPN" 185SUMMARY_${PN}-plugin-vpn-openvpn = "An OpenVPN plugin for ConnMan VPN"
178DESCRIPTION_${PN}-plugin-vpn-openvpn = "The ConnMan OpenVPN plugin uses openvpn client \ 186DESCRIPTION_${PN}-plugin-vpn-openvpn = "The ConnMan OpenVPN plugin uses openvpn client \
179to create a VPN connection to OpenVPN server." 187to 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 \
7 file://0003-Fix-header-inclusions-for-musl.patch \ 7 file://0003-Fix-header-inclusions-for-musl.patch \
8 file://connman \ 8 file://connman \
9 " 9 "
10SRC_URI[md5sum] = "4a3efdbd6796922db9c6f66da57887fa" 10SRC_URI[md5sum] = "cb1c413fcc4f49430294bbd7a92f5f3c"
11SRC_URI[sha256sum] = "5c5e464bacc9c27ed4e7269fb9b5059f07947f5be26433b59212133663ffa991" 11SRC_URI[sha256sum] = "88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2"
12 12
13RRECOMMENDS_${PN} = "connman-conf" 13RRECOMMENDS_${PN} = "connman-conf"
14 14