diff options
| author | Maxin B. John <maxin.john@intel.com> | 2015-11-23 18:11:47 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:09 +0000 |
| commit | 744e89f6ebaee1125a3808c2a611e315566bb667 (patch) | |
| tree | 2c6f449c861b67d8c7a9910b5544a89da6e824b4 /meta | |
| parent | 996f8437ed27dedad5c0a7356687a46319fdf682 (diff) | |
| download | poky-744e89f6ebaee1125a3808c2a611e315566bb667.tar.gz | |
ofono: upgrade to version 1.17
Removed the patch 0001-backtrace-Disable-for-non-glibc-C-libraries.patch,
as it is included in the new sources.
(From OE-Core rev: 4ffa6d6950f23afa549116ff2bfb30e687888914)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 11 insertions, 52 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 deleted file mode 100644 index 306b6da337..0000000000 --- a/meta/recipes-connectivity/ofono/ofono/0001-backtrace-Disable-for-non-glibc-C-libraries.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 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 deleted file mode 100644 index fbf13e52b7..0000000000 --- a/meta/recipes-connectivity/ofono/ofono_1.16.bb +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | require ofono.inc | ||
| 2 | |||
| 3 | SRC_URI = "\ | ||
| 4 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | ||
| 5 | file://ofono \ | ||
| 6 | file://Revert-test-Convert-to-Python-3.patch \ | ||
| 7 | file://0001-backtrace-Disable-for-non-glibc-C-libraries.patch \ | ||
| 8 | " | ||
| 9 | SRC_URI[md5sum] = "c31b5b55a1d68354bff771d3edf02829" | ||
| 10 | SRC_URI[sha256sum] = "403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07" | ||
| 11 | |||
| 12 | CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" | ||
diff --git a/meta/recipes-connectivity/ofono/ofono_1.17.bb b/meta/recipes-connectivity/ofono/ofono_1.17.bb new file mode 100644 index 0000000000..947f9d714a --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono_1.17.bb | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | require ofono.inc | ||
| 2 | |||
| 3 | SRC_URI = "\ | ||
| 4 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | ||
| 5 | file://ofono \ | ||
| 6 | file://Revert-test-Convert-to-Python-3.patch \ | ||
| 7 | " | ||
| 8 | SRC_URI[md5sum] = "d280b1d267ba5bf391d2a898fea7c748" | ||
| 9 | SRC_URI[sha256sum] = "cbf20f07fd15253c682b23c1786d517f505c3688f7c4ea93da777e1523b89635" | ||
| 10 | |||
| 11 | CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" | ||
