From dd3d82b54fa9f13527064fe7b9d541926c6b13f2 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Tue, 21 Jan 2014 15:55:44 +0200 Subject: connman: upgrade to 1.21 This is mainly a bug fix release. - gtk-doc infrastructure has been removed starting with connman 1.21; as such, support for it has been removed from the recipe; - Updated bug tracker site; - Cosmetic cleanup; Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- meta/recipes-connectivity/connman/connman.inc | 7 ++----- meta/recipes-connectivity/connman/connman_1.20.bb | 12 ------------ meta/recipes-connectivity/connman/connman_1.21.bb | 11 +++++++++++ 3 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman_1.20.bb create mode 100644 meta/recipes-connectivity/connman/connman_1.21.bb (limited to 'meta/recipes-connectivity') 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, \ configuration methods, like DHCP and domain name resolving, are \ implemented using plug-ins." HOMEPAGE = "http://connman.net/" -BUGTRACKER = "http://bugs.meego.com/buglist.cgi?quicksearch=connman" +BUGTRACKER = "https://01.org/jira/browse/CM" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d" @@ -66,13 +66,10 @@ SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -UNKNOWN_CONFIGURE_WHITELIST += "--disable-gtk-doc-pdf --disable-gtk-doc-html" - -inherit autotools gtk-doc pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d do_configure_append () { sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service - } # 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.20.bb deleted file mode 100644 index 4af71e28bb..0000000000 --- a/meta/recipes-connectivity/connman/connman_1.20.bb +++ /dev/null @@ -1,12 +0,0 @@ -require connman.inc - -SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ - file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ - file://add_xuser_dbus_permission.patch \ - file://connman \ - " - -SRC_URI[md5sum] = "15f5e0d89e01b81c79306f54a2014efd" -SRC_URI[sha256sum] = "4e638443be959913a5ce0d51df10018448ed08d06e4f8a47ce4b3c705bc78ac1" - -RRECOMMENDS_${PN} = "connman-conf" diff --git a/meta/recipes-connectivity/connman/connman_1.21.bb b/meta/recipes-connectivity/connman/connman_1.21.bb new file mode 100644 index 0000000000..48ed20edcc --- /dev/null +++ b/meta/recipes-connectivity/connman/connman_1.21.bb @@ -0,0 +1,11 @@ +require connman.inc + +SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ + file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ + file://add_xuser_dbus_permission.patch \ + file://connman \ + " +SRC_URI[md5sum] = "483633162b819c8b99fec970f92e311d" +SRC_URI[sha256sum] = "e80f4e9c639ef016e9c497c122c349dbc9e6dc78a9976f986134739ee208c08a" + +RRECOMMENDS_${PN} = "connman-conf" -- cgit 1.2.3-korg