mirror of
https://git.yoctoproject.org/poky
synced 2026-02-16 05:33:03 +01:00
ofono: update to 1.30
Removed upstreamed patches. (From OE-Core rev: 79a14772ef2ab6c73bb438377cd259c484020818) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Oleksandr Kravchuk
committed by
Richard Purdie
Richard Purdie
parent
779875ad69
commit
b36c32ca2b
@@ -1,50 +0,0 @@
|
||||
From eeaf8dac80f15a2b7c18d1d4ee63106973a6a873 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Bunk <bunk@kernel.org>
|
||||
Date: Tue, 21 May 2019 14:13:35 +0300
|
||||
Subject: Makefile.am: Don't overwrite src_ofonod_DEPENDENCIES
|
||||
|
||||
src_ofonod_DEPENDENCIES did overwrite the dependencies
|
||||
automatically generated from src_ofonod_LDADD with
|
||||
incomplete dependencies.
|
||||
|
||||
This fixes the following build error:
|
||||
...
|
||||
CCLD src/ofonod
|
||||
libtool: error: cannot find the library 'gdbus/libgdbus-internal.la' or unhandled argument 'gdbus/libgdbus-internal.la'
|
||||
make: *** [Makefile:3448: src/ofonod] Error 1
|
||||
|
||||
Upstream-Status: Submitted
|
||||
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
||||
---
|
||||
Makefile.am | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index d2e310d5..5edc4488 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -6,12 +6,10 @@ noinst_LTLIBRARIES =
|
||||
if EXTERNAL_ELL
|
||||
ell_cflags = @ELL_CFLAGS@
|
||||
ell_ldadd = @ELL_LIBS@
|
||||
-ell_dependencies =
|
||||
ell_built_sources =
|
||||
else
|
||||
ell_cflags =
|
||||
ell_ldadd = ell/libell-internal.la
|
||||
-ell_dependencies = $(ell_ldadd)
|
||||
ell_built_sources = ell/internal ell/ell.h
|
||||
|
||||
noinst_LTLIBRARIES += ell/libell-internal.la
|
||||
@@ -729,8 +727,6 @@ src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) $(ell_ldadd) \
|
||||
src_ofonod_LDFLAGS = -Wl,--export-dynamic \
|
||||
-Wl,--version-script=$(srcdir)/src/ofono.ver
|
||||
|
||||
-src_ofonod_DEPENDENCIES = $(ell_dependencies)
|
||||
-
|
||||
BUILT_SOURCES = $(local_headers) $(ell_built_sources) src/builtin.h
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From dff595671bf5a46f7c9231966a6cd7d2a0183076 Mon Sep 17 00:00:00 2001
|
||||
From: Marcel Holtmann <marcel@holtmann.org>
|
||||
Date: Wed, 15 May 2019 09:39:44 +0200
|
||||
Subject: build: Add check for explicit_bzero support
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bacb7ac5..cad35c5d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -54,6 +54,8 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
|
||||
fi
|
||||
])
|
||||
|
||||
+AC_CHECK_FUNCS(explicit_bzero)
|
||||
+
|
||||
AC_CHECK_FUNC(signalfd, dummy=yes,
|
||||
AC_MSG_ERROR(signalfd support is required))
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From 3e43e3342f3fada1624a28500a5337019fed7d89 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Bunk <bunk@kernel.org>
|
||||
Date: Thu, 9 May 2019 12:19:51 +0300
|
||||
Subject: build: Fix a race condition
|
||||
|
||||
ell/ell.h was written before ell/ existed
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
||||
---
|
||||
Makefile.am | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index a569c4a3..d2e310d5 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1107,6 +1107,7 @@ ell/internal: Makefile
|
||||
done > $@
|
||||
|
||||
ell/ell.h: Makefile
|
||||
+ $(AM_V_at)$(MKDIR_P) ell
|
||||
$(AM_V_at)echo -n > $@
|
||||
$(AM_V_GEN)for f in $(ell_headers) ; do \
|
||||
echo "#include <$$f>" >> $@ ; \
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From 48e31f9fc3cf3c486c3d27a67b2687f6df0c5c71 Mon Sep 17 00:00:00 2001
|
||||
From: Denis Kenzior <denkenz@gmail.com>
|
||||
Date: Thu, 16 May 2019 15:10:53 -0500
|
||||
Subject: main: Quiet ld errors with external ell
|
||||
|
||||
When oFono is built with --enable-external-ell, the compiler for some
|
||||
reason does not generate a debug section on some systems. This is due
|
||||
to the fact that l_debug is never called. However, ell also does not
|
||||
call l_debug, yet when built-in ell is used, the section is created by
|
||||
the compiler.
|
||||
|
||||
For now work around this by adding a no-op l_debug() call in main.c.
|
||||
The real fix is to migrate all of the oFono logging functionality to use
|
||||
ell instead.
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
||||
---
|
||||
src/main.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 8623a060..4529cde1 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -236,6 +236,7 @@ int main(int argc, char **argv)
|
||||
event_loop = g_main_loop_new(NULL, FALSE);
|
||||
|
||||
l_log_set_stderr();
|
||||
+ l_debug("");
|
||||
l_debug_enable("*");
|
||||
l_main_init();
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
require ofono.inc
|
||||
|
||||
SRC_URI = "\
|
||||
${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
|
||||
file://ofono \
|
||||
file://0001-build-Fix-a-race-condition.patch \
|
||||
file://0001-build-Add-check-for-explicit_bzero-support.patch \
|
||||
file://0001-main-Quiet-ld-errors-with-external-ell.patch \
|
||||
file://0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch \
|
||||
file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8"
|
||||
SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679"
|
||||
9
meta/recipes-connectivity/ofono/ofono_1.30.bb
Normal file
9
meta/recipes-connectivity/ofono/ofono_1.30.bb
Normal file
@@ -0,0 +1,9 @@
|
||||
require ofono.inc
|
||||
|
||||
SRC_URI = "\
|
||||
${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
|
||||
file://ofono \
|
||||
file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "2b1ce11a4db1f4b5c8cd96eb7e96ba0c"
|
||||
SRC_URI[sha256sum] = "8079735efc5d7f33be9e792e791f2f7ff75c31ce67d477b994673e32319eec5c"
|
||||
Reference in New Issue
Block a user