summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/connman/connman.inc2
-rw-r--r--meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch55
-rw-r--r--meta/recipes-connectivity/connman/connman_1.12.bb (renamed from meta/recipes-connectivity/connman/connman_1.10.bb)5
3 files changed, 3 insertions, 59 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index db4d26c3a8..04b21f7259 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r18" 23INC_PR = "r0"
24 24
25TIST = "--enable-tist" 25TIST = "--enable-tist"
26TIST_powerpc = "" 26TIST_powerpc = ""
diff --git a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
deleted file mode 100644
index 7315545c26..0000000000
--- a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 7007ef32a959ac4717c19339a24fd90a68638a19 Mon Sep 17 00:00:00 2001
2From: Andrei Gherzan <andrei@gherzan.ro>
3Date: Tue, 17 Jul 2012 16:07:17 +0300
4Subject: [PATCH V3 2/2] storage.c: If there is no d_type support use
5 fstatat()
6
7This is useful for filesystems where d_type is always DT_UNKNOWN.
8In this case use fstatat() function.
9
10Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
11Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
12Upstream-Status: Submitted
13
14---
15 src/storage.c | 19 +++++++++++++++++++
16 1 file changed, 19 insertions(+)
17
18Index: git/src/storage.c
19===================================================================
20--- git.orig/src/storage.c
21+++ git/src/storage.c
22@@ -193,7 +193,6 @@ gchar **connman_storage_get_services()
23
24 switch (d->d_type) {
25 case DT_DIR:
26- case DT_UNKNOWN:
27 /*
28 * If the settings file is not found, then
29 * assume this directory is not a services dir.
30@@ -203,6 +202,25 @@ gchar **connman_storage_get_services()
31 ret = stat(str, &buf);
32 g_free(str);
33 if (ret < 0)
34+ continue;
35+
36+ g_string_append_printf(result, "%s/", d->d_name);
37+ break;
38+ case DT_UNKNOWN:
39+ /*
40+ * If there is no d_type support use fstatat()
41+ * to check if directory
42+ */
43+ ret = fstatat(dirfd(dir), d->d_name, &buf, 0);
44+ if (ret < 0)
45+ continue;
46+ if (!(buf.st_mode & S_IFDIR))
47+ continue;
48+ str = g_strdup_printf("%s/%s/settings", STORAGEDIR,
49+ d->d_name);
50+ ret = stat(str, &buf);
51+ g_free(str);
52+ if (ret < 0)
53 continue;
54
55 g_string_append_printf(result, "%s/", d->d_name);
diff --git a/meta/recipes-connectivity/connman/connman_1.10.bb b/meta/recipes-connectivity/connman/connman_1.12.bb
index 7dca1b40bf..5ba4032c45 100644
--- a/meta/recipes-connectivity/connman/connman_1.10.bb
+++ b/meta/recipes-connectivity/connman/connman_1.12.bb
@@ -1,12 +1,11 @@
1require connman.inc 1require connman.inc
2 2
3# 1.10 tag 3# 1.12 tag
4SRCREV = "3bda76eb442c9395db1dba17352c3e78376671cc" 4SRCREV = "8397cbbc0a79d39cf3b1880f4fd3f3405b6bc6ad"
5SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ 5SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
6 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 6 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
7 file://add_xuser_dbus_permission.patch \ 7 file://add_xuser_dbus_permission.patch \
8 file://connman \ 8 file://connman \
9 file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \
10 file://inet-fix-ip-cleanup-functions.patch \ 9 file://inet-fix-ip-cleanup-functions.patch \
11 file://add-in.h-for-ipv6.patch" 10 file://add-in.h-for-ipv6.patch"
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"