diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-04-06 17:36:48 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-08 10:45:26 +0100 |
| commit | 4dd6bca8cdf538a7da9ffcb36faf70c3436b4f19 (patch) | |
| tree | d27cd69f06870b2cdd9108a3a5a80f925135dec1 | |
| parent | fd05945ac11a0eea9302e4fba13b6411cf2137fc (diff) | |
| download | openembedded-core-contrib-4dd6bca8cdf538a7da9ffcb36faf70c3436b4f19.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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-connectivity/ofono/ofono_1.16.bb | 1 |
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 @@ +From 2d729af0897d7d72b83d111876febf9e0eec1a68 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 3 Apr 2015 20:50:56 -0700 +Subject: [PATCH] backtrace: Disable for non-glibc C libraries + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +--- + src/log.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/log.c b/src/log.c +index febc874..9db4ae7 100644 +--- a/src/log.c ++++ b/src/log.c +@@ -30,7 +30,9 @@ + #include <stdlib.h> + #include <string.h> + #include <syslog.h> ++#ifdef __GLIBC__ + #include <execinfo.h> ++#endif + #include <dlfcn.h> + + #include "ofono.h" +@@ -219,8 +221,9 @@ static void signal_handler(int signo) + { + ofono_error("Aborting (signal %d) [%s]", signo, program_exec); + ++#ifdef __GLIBC__ + print_backtrace(2); +- ++#endif + exit(EXIT_FAILURE); + } + +-- +2.1.4 + 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 = "\ ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://ofono \ file://Revert-test-Convert-to-Python-3.patch \ + file://0001-backtrace-Disable-for-non-glibc-C-libraries.patch \ " SRC_URI[md5sum] = "c31b5b55a1d68354bff771d3edf02829" SRC_URI[sha256sum] = "403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07" |