mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 22:26:31 +00:00
ofono: bump to version 1.17
Updated patch with uClibc support - merge with upstream support for musl. Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
088e8a7746
commit
7057555d00
@ -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
|
isn't really critical, so simply remove backtrace info if not
|
||||||
available in uClibc.
|
available in uClibc.
|
||||||
|
|
||||||
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
NOTE: based on patch from Peter Korsgaard <jacmet@sunsite.dk>
|
||||||
---
|
|
||||||
src/log.c | 7 +++++++
|
|
||||||
1 file changed, 7 insertions(+)
|
|
||||||
|
|
||||||
Index: ofono-1.5/src/log.c
|
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||||
===================================================================
|
---
|
||||||
--- ofono-1.5.orig/src/log.c
|
--- ofono-1.7.orig/src/log.c
|
||||||
+++ ofono-1.5/src/log.c
|
+++ ofono-1.7/src/log.c
|
||||||
@@ -30,7 +30,12 @@
|
@@ -30,7 +30,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <syslog.h>
|
#include <syslog.h>
|
||||||
+#include <features.h>
|
-#ifdef __GLIBC__
|
||||||
+/* backtrace support is optional on uClibc */
|
+#if defined(__GLIBC__) && !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__))
|
||||||
+#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__))
|
|
||||||
+#define HAVE_BACKTRACE
|
+#define HAVE_BACKTRACE
|
||||||
#include <execinfo.h>
|
#include <execinfo.h>
|
||||||
+#endif
|
#endif
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
@@ -115,7 +116,7 @@
|
||||||
#include "ofono.h"
|
va_end(ap);
|
||||||
@@ -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 */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
# From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc
|
# 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
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
OFONO_VERSION = 1.16
|
OFONO_VERSION = 1.17
|
||||||
OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz
|
OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz
|
||||||
OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
|
OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
|
||||||
OFONO_LICENSE = GPLv2
|
OFONO_LICENSE = GPLv2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user