summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-06 17:36:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:28 +0100
commitbe8ffcd261ccd8b7acde0d291e93d1b27f6edde8 (patch)
treee5c31f0211b7fc57ad1fcd76bcc6eaf5febe902e /meta
parentf5e7eee6e939be96c5c47cdf80573c5903e78f9b (diff)
downloadpoky-be8ffcd261ccd8b7acde0d291e93d1b27f6edde8.tar.gz
ofono: Disable backtrace for non-glibc libraries
It uses glibc backtrace() API which is not implemented everywhere e.g. musl Change-Id: I96380b994c27968542dba6dae220adfecaeda556 (From OE-Core rev: 4dd6bca8cdf538a7da9ffcb36faf70c3436b4f19) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch40
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.16.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch b/meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch
new file mode 100644
index 0000000000..306b6da337
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch
@@ -0,0 +1,40 @@
1From 2d729af0897d7d72b83d111876febf9e0eec1a68 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Apr 2015 20:50:56 -0700
4Subject: [PATCH] backtrace: Disable for non-glibc C libraries
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending
8
9---
10 src/log.c | 5 ++++-
11 1 file changed, 4 insertions(+), 1 deletion(-)
12
13diff --git a/src/log.c b/src/log.c
14index febc874..9db4ae7 100644
15--- a/src/log.c
16+++ b/src/log.c
17@@ -30,7 +30,9 @@
18 #include <stdlib.h>
19 #include <string.h>
20 #include <syslog.h>
21+#ifdef __GLIBC__
22 #include <execinfo.h>
23+#endif
24 #include <dlfcn.h>
25
26 #include "ofono.h"
27@@ -219,8 +221,9 @@ static void signal_handler(int signo)
28 {
29 ofono_error("Aborting (signal %d) [%s]", signo, program_exec);
30
31+#ifdef __GLIBC__
32 print_backtrace(2);
33-
34+#endif
35 exit(EXIT_FAILURE);
36 }
37
38--
392.1.4
40
diff --git a/meta/recipes-connectivity/ofono/ofono_1.16.bb b/meta/recipes-connectivity/ofono/ofono_1.16.bb
index 712fc5c805..fbf13e52b7 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.16.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.16.bb
@@ -4,6 +4,7 @@ SRC_URI = "\
4 ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ 4 ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
5 file://ofono \ 5 file://ofono \
6 file://Revert-test-Convert-to-Python-3.patch \ 6 file://Revert-test-Convert-to-Python-3.patch \
7 file://0001-backtrace-Disable-for-non-glibc-C-libraries.patch \
7" 8"
8SRC_URI[md5sum] = "c31b5b55a1d68354bff771d3edf02829" 9SRC_URI[md5sum] = "c31b5b55a1d68354bff771d3edf02829"
9SRC_URI[sha256sum] = "403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07" 10SRC_URI[sha256sum] = "403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07"