Update connman to v1.3, fix dependencies and runtime
v2 cover Update connman to v1.3, fix dependencies and runtime
Update connman to v1.3.
Fix dependencies needed for tests.
Add patches to fix runtime segfault on mips and ppc.
The following changes since commit 90ad663909c0c8a405b22a510c9f957007d02669:
upstream_tracking: update boost (2012-07-09 17:21:38 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ag/connman1.3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ag/connman1.3
Andrei Gherzan (3):
connman: Update to version 1.3
connman.inc: Add missing dependencies needed by some tests
connman: Add patches to fix connman on fs with no d_type support
meta/recipes-connectivity/connman/connman.inc | 4 +-
....c-If-there-is-no-d_type-support-use-stat.patch | 44 +++++++++++++++
....c-If-there-is-no-d_type-support-use-stat.patch | 56 ++++++++++++++++++++
.../connman/{connman_1.0.bb => connman_1.3.bb} | 10 ++--
4 files changed, 108 insertions(+), 6 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman/0001-storage.c-If-there-is-no-d_type-support-use-stat.patch
create mode 100644 meta/recipes-connectivity/connman/connman/0002-timezone.c-If-there-is-no-d_type-support-use-stat.patch
rename meta/recipes-connectivity/connman/{connman_1.0.bb => connman_1.3.bb} (47%)Signature · 1 line
1.7.9.5
PATCH v2 1/3 connman: Update to version 1.3
From: Andrei Gherzan <[email protected]>
---
.../connman/{connman_1.0.bb => connman_1.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/connman/{connman_1.0.bb => connman_1.3.bb} (82%)meta/recipes-connectivity/connman/connman_1.3.bb renamed from meta/recipes-connectivity/connman/connman_1.0.bb +2 -2
@@ -1,7 +1,7 @@ require connman.inc -# 1.0 tag -SRCREV = "6d6f312fb2b751b4cf7037f2a526c7785364732f" +# 1.3 tag +SRCREV = "3c0fa84091524c7cd6237744f2088ffee2f1d5ad" SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ file://add_xuser_dbus_permission.patch \
Signature · 1 line
1.7.9.5
PATCH v2 2/3 connman.inc: Add missing dependencies needed by some tests
From: Andrei Gherzan <[email protected]>
Some tests need:
* gobject and optparse module (ex: test-session)
* subprocess and fnctl module (ex: backtrace)
* urllib module (ex: get-proxy-autoconfig)
--- meta/recipes-connectivity/connman/connman.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/connman/connman.inc +2 -2
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ " -INC_PR = "r11" +INC_PR = "r12" TIST = "--enable-tist" TIST_powerpc = ""
@@ -113,7 +113,7 @@ PACKAGES =+ "${PN}-tools ${PN}-tests" FILES_${PN}-tools = "${bindir}/wispr" FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${BPN}/test/*" -RDEPENDS_${PN}-tests = "python-dbus" +RDEPENDS_${PN}-tests = "python-dbus python-pygobject python-textutils python-subprocess python-fcntl python-netclient" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${libdir}/connman/plugins \
Signature · 1 line
1.7.9.5
PATCH v2 3/3 connman: Add patches to fix connman on fs with no d_type support
In reply to Andrei GherzanWhen there is not d_type avalaible on filesystem, fstatat (stat) can be used to check if path is directory.storage.c and timezone.c were modified accordingly.
--- ....c-If-there-is-no-d_type-support-use-stat.patch | 44 +++++++++++++++ ....c-If-there-is-no-d_type-support-use-stat.patch | 56 ++++++++++++++++++++ meta/recipes-connectivity/connman/connman_1.3.bb | 6 ++- 3 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/connman/connman/0001-storage.c-If-there-is-no-d_type-support-use-stat.patch create mode 100644 meta/recipes-connectivity/connman/connman/0002-timezone.c-If-there-is-no-d_type-support-use-stat.patch
meta/recipes-connectivity/connman/connman/0001-storage.c-If-there-is-no-d_type-support-use-stat.patch new file +44 -0
@@ -0,0 +1,44 @@ +From c167bfd6b5edd01dbbb4794f3851933b2650db0e Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <[email protected]> +Date: Tue, 17 Jul 2012 16:07:17 +0300 +Subject: [PATCH V3 1/2] storage.c: If there is no d_type support use stat() + +This is usefull for filesystems where d_type is always DT_UNKNOWN. +In this case use stat() function. +--- + src/storage.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/src/storage.c b/src/storage.c +index 47bd0cb..0cffa0a 100644 +--- a/src/storage.c ++++ b/src/storage.c +@@ -206,6 +206,25 @@ gchar **connman_storage_get_services() + + g_string_append_printf(result, "%s/", d->d_name); + break; ++ case DT_UNKNOWN: ++ /* ++ * If there is no d_type support use stat() ++ * to check if directory ++ */ ++ ret = fstatat(dirfd(dir), d->d_name, &buf, 0); ++ if (ret < 0) ++ continue; ++ if (!buf.st_mode & S_IFDIR) ++ continue; ++ str = g_strdup_printf("%s/%s/settings", STORAGEDIR, ++ d->d_name); ++ ret = stat(str, &buf); ++ g_free(str); ++ if (ret < 0) ++ continue; ++ ++ g_string_append_printf(result, "%s/", d->d_name); ++ break; + } + } + +-- +1.7.9.5 +
meta/recipes-connectivity/connman/connman/0002-timezone.c-If-there-is-no-d_type-support-use-stat.patch new file +56 -0
56 lines not on this page · raw message
meta/recipes-connectivity/connman/connman_1.3.bb +4 -2
@@ -5,6 +5,8 @@ SRCREV = "3c0fa84091524c7cd6237744f2088ffee2f1d5ad" SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ file://add_xuser_dbus_permission.patch \ - file://connman" + file://connman \ + file://0001-storage.c-If-there-is-no-d_type-support-use-stat.patch \ + file://0002-timezone.c-If-there-is-no-d_type-support-use-stat.patch" S = "${WORKDIR}/git" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1"
Signature · 1 line
1.7.9.5