diff --git a/package/ofono/0001-uclibc-backtrace.patch b/package/ofono/0001-uclibc-backtrace.patch index 8499bcfb93..3ce7bf8cbc 100644 --- a/package/ofono/0001-uclibc-backtrace.patch +++ b/package/ofono/0001-uclibc-backtrace.patch @@ -4,41 +4,46 @@ Backtrace support is only used for logging on signal errors, which isn't really critical, so simply remove backtrace info if not available in uClibc. -Signed-off-by: Peter Korsgaard ---- - src/log.c | 7 +++++++ - 1 file changed, 7 insertions(+) +NOTE: based on patch from Peter Korsgaard -Index: ofono-1.5/src/log.c -=================================================================== ---- ofono-1.5.orig/src/log.c -+++ ofono-1.5/src/log.c -@@ -30,7 +30,12 @@ +Signed-off-by: Petr Vorel +--- +--- ofono-1.7.orig/src/log.c ++++ ofono-1.7/src/log.c +@@ -30,7 +30,8 @@ #include #include #include -+#include -+/* backtrace support is optional on uClibc */ -+#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) +#define HAVE_BACKTRACE #include -+#endif + #endif #include - - #include "ofono.h" -@@ -115,6 +120,7 @@ - - static void print_backtrace(unsigned int offset) - { -+#ifdef HAVE_BACKTRACE - void *frames[99]; - size_t n_ptrs; - unsigned int i; -@@ -213,6 +219,7 @@ - - close(outfd[1]); - close(infd[0]); -+#endif /* HAVE_BACKTRACE */ +@@ -115,7 +116,7 @@ + va_end(ap); } - static void signal_handler(int signo) +-#ifdef __GLIBC__ ++#ifdef HAVE_BACKTRACE + static void print_backtrace(unsigned int offset) + { + void *frames[99]; +@@ -309,7 +310,7 @@ + if (detach == FALSE) + option |= LOG_PERROR; + +-#ifdef __GLIBC__ ++#ifdef HAVE_BACKTRACE + signal_setup(signal_handler); + #endif + +@@ -326,7 +327,7 @@ + + closelog(); + +-#ifdef __GLIBC__ ++#ifdef HAVE_BACKTRACE + signal_setup(SIG_DFL); + #endif + diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash index e83ce1a9f0..50c92ede65 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07 ofono-1.16.tar.xz +sha256 cbf20f07fd15253c682b23c1786d517f505c3688f7c4ea93da777e1523b89635 ofono-1.17.tar.xz diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 7899750461..588c9cd62b 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 1.16 +OFONO_VERSION = 1.17 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPLv2