diff options
| -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 @@ | |||
| 1 | From 2d729af0897d7d72b83d111876febf9e0eec1a68 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 3 Apr 2015 20:50:56 -0700 | ||
| 4 | Subject: [PATCH] backtrace: Disable for non-glibc C libraries | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | --- | ||
| 10 | src/log.c | 5 ++++- | ||
| 11 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/src/log.c b/src/log.c | ||
| 14 | index 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 | -- | ||
| 39 | 2.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 | " |
| 8 | SRC_URI[md5sum] = "c31b5b55a1d68354bff771d3edf02829" | 9 | SRC_URI[md5sum] = "c31b5b55a1d68354bff771d3edf02829" |
| 9 | SRC_URI[sha256sum] = "403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07" | 10 | SRC_URI[sha256sum] = "403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07" |
