diff options
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 7 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman_1.21.bb (renamed from meta/recipes-connectivity/connman/connman_1.20.bb) | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index f2c42fcd19..84d8d1d200 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -8,7 +8,7 @@ to support all kinds of wired or wireless technologies. Also, \ | |||
8 | configuration methods, like DHCP and domain name resolving, are \ | 8 | configuration methods, like DHCP and domain name resolving, are \ |
9 | implemented using plug-ins." | 9 | implemented using plug-ins." |
10 | HOMEPAGE = "http://connman.net/" | 10 | HOMEPAGE = "http://connman.net/" |
11 | BUGTRACKER = "http://bugs.meego.com/buglist.cgi?quicksearch=connman" | 11 | BUGTRACKER = "https://01.org/jira/browse/CM" |
12 | LICENSE = "GPLv2" | 12 | LICENSE = "GPLv2" |
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ |
14 | file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d" | 14 | file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d" |
@@ -66,13 +66,10 @@ SYSTEMD_SERVICE_${PN} = "connman.service" | |||
66 | SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" | 66 | SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" |
67 | SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" | 67 | SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" |
68 | 68 | ||
69 | UNKNOWN_CONFIGURE_WHITELIST += "--disable-gtk-doc-pdf --disable-gtk-doc-html" | 69 | inherit autotools pkgconfig systemd update-rc.d |
70 | |||
71 | inherit autotools gtk-doc pkgconfig systemd update-rc.d | ||
72 | 70 | ||
73 | do_configure_append () { | 71 | do_configure_append () { |
74 | sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service | 72 | sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service |
75 | |||
76 | } | 73 | } |
77 | 74 | ||
78 | # This allows *everyone* to access ConnMan over DBus, without any access | 75 | # This allows *everyone* to access ConnMan over DBus, without any access |
diff --git a/meta/recipes-connectivity/connman/connman_1.20.bb b/meta/recipes-connectivity/connman/connman_1.21.bb index 4af71e28bb..48ed20edcc 100644 --- a/meta/recipes-connectivity/connman/connman_1.20.bb +++ b/meta/recipes-connectivity/connman/connman_1.21.bb | |||
@@ -5,8 +5,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | |||
5 | file://add_xuser_dbus_permission.patch \ | 5 | file://add_xuser_dbus_permission.patch \ |
6 | file://connman \ | 6 | file://connman \ |
7 | " | 7 | " |
8 | 8 | SRC_URI[md5sum] = "483633162b819c8b99fec970f92e311d" | |
9 | SRC_URI[md5sum] = "15f5e0d89e01b81c79306f54a2014efd" | 9 | SRC_URI[sha256sum] = "e80f4e9c639ef016e9c497c122c349dbc9e6dc78a9976f986134739ee208c08a" |
10 | SRC_URI[sha256sum] = "4e638443be959913a5ce0d51df10018448ed08d06e4f8a47ce4b3c705bc78ac1" | ||
11 | 10 | ||
12 | RRECOMMENDS_${PN} = "connman-conf" | 11 | RRECOMMENDS_${PN} = "connman-conf" |