diff --git a/.checkpackageignore b/.checkpackageignore index c9e30cf5f1..554c05ef70 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -861,7 +861,6 @@ package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch l package/nuttcp/0001-susv3-legacy.patch lib_patch.Upstream package/nvidia-driver/0001-use-LDFLAGS.patch lib_patch.Upstream package/octave/0001-Fix-BLAS-library-integer-size-detection.patch lib_patch.Upstream -package/ofono/0001-uclibc-backtrace.patch lib_patch.Upstream package/ofono/S46ofono lib_sysv.Variables package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch lib_patch.Upstream package/olsr/0001-olsrd-migrate-to-using-bison-3.7.1.patch lib_patch.Upstream diff --git a/package/ofono/0001-uclibc-backtrace.patch b/package/ofono/0001-uclibc-backtrace.patch deleted file mode 100644 index 3fa2414978..0000000000 --- a/package/ofono/0001-uclibc-backtrace.patch +++ /dev/null @@ -1,49 +0,0 @@ -[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE - -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. - -NOTE: based on patch from Peter Korsgaard - -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 --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) -+#define HAVE_BACKTRACE - #include - #endif - #include -@@ -115,7 +116,7 @@ - va_end(ap); - } - --#ifdef __GLIBC__ -+#ifdef HAVE_BACKTRACE - static void print_backtrace(unsigned int offset) - { - void *frames[99]; -@@ -312,7 +313,7 @@ - if (detach == FALSE) - option |= LOG_PERROR; - --#ifdef __GLIBC__ -+#ifdef HAVE_BACKTRACE - signal_setup(signal_handler); - #endif - -@@ -329,7 +330,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 9e2fd413f9..31fae82eb9 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 5e13121c0f885a81ad882db065549ea13477abbcc219f150b38a8d2ac92521de ofono-2.2.tar.xz +sha256 f74c3bba7ebac488fed7bcfa6113b0e39e723d2e1a24b53f79c9f18a1c85dd00 ofono-2.18.tar.xz # Locally computed sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index ba0846e823..ee6020ab2e 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 2.2 +OFONO_VERSION = 2.18 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0