summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch50
-rw-r--r--meta/recipes-connectivity/ofono/ofono/0001-build-Add-check-for-explicit_bzero-support.patch27
-rw-r--r--meta/recipes-connectivity/ofono/ofono/0001-build-Fix-a-race-condition.patch28
-rw-r--r--meta/recipes-connectivity/ofono/ofono/0001-main-Quiet-ld-errors-with-external-ell.patch36
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.29.bb13
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.30.bb9
6 files changed, 9 insertions, 154 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch b/meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch
deleted file mode 100644
index 77073ddb1c..0000000000
--- a/meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From eeaf8dac80f15a2b7c18d1d4ee63106973a6a873 Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@kernel.org>
3Date: Tue, 21 May 2019 14:13:35 +0300
4Subject: Makefile.am: Don't overwrite src_ofonod_DEPENDENCIES
5
6src_ofonod_DEPENDENCIES did overwrite the dependencies
7automatically generated from src_ofonod_LDADD with
8incomplete dependencies.
9
10This fixes the following build error:
11...
12 CCLD src/ofonod
13libtool: error: cannot find the library 'gdbus/libgdbus-internal.la' or unhandled argument 'gdbus/libgdbus-internal.la'
14make: *** [Makefile:3448: src/ofonod] Error 1
15
16Upstream-Status: Submitted
17Signed-off-by: Adrian Bunk <bunk@stusta.de>
18---
19 Makefile.am | 4 ----
20 1 file changed, 4 deletions(-)
21
22diff --git a/Makefile.am b/Makefile.am
23index d2e310d5..5edc4488 100644
24--- a/Makefile.am
25+++ b/Makefile.am
26@@ -6,12 +6,10 @@ noinst_LTLIBRARIES =
27 if EXTERNAL_ELL
28 ell_cflags = @ELL_CFLAGS@
29 ell_ldadd = @ELL_LIBS@
30-ell_dependencies =
31 ell_built_sources =
32 else
33 ell_cflags =
34 ell_ldadd = ell/libell-internal.la
35-ell_dependencies = $(ell_ldadd)
36 ell_built_sources = ell/internal ell/ell.h
37
38 noinst_LTLIBRARIES += ell/libell-internal.la
39@@ -729,8 +727,6 @@ src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) $(ell_ldadd) \
40 src_ofonod_LDFLAGS = -Wl,--export-dynamic \
41 -Wl,--version-script=$(srcdir)/src/ofono.ver
42
43-src_ofonod_DEPENDENCIES = $(ell_dependencies)
44-
45 BUILT_SOURCES = $(local_headers) $(ell_built_sources) src/builtin.h
46
47 CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
48--
492.20.1
50
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-build-Add-check-for-explicit_bzero-support.patch b/meta/recipes-connectivity/ofono/ofono/0001-build-Add-check-for-explicit_bzero-support.patch
deleted file mode 100644
index 4676bb7668..0000000000
--- a/meta/recipes-connectivity/ofono/ofono/0001-build-Add-check-for-explicit_bzero-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From dff595671bf5a46f7c9231966a6cd7d2a0183076 Mon Sep 17 00:00:00 2001
2From: Marcel Holtmann <marcel@holtmann.org>
3Date: Wed, 15 May 2019 09:39:44 +0200
4Subject: build: Add check for explicit_bzero support
5
6Upstream-Status: Backport
7Signed-off-by: Adrian Bunk <bunk@stusta.de>
8---
9 configure.ac | 2 ++
10 1 file changed, 2 insertions(+)
11
12diff --git a/configure.ac b/configure.ac
13index bacb7ac5..cad35c5d 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -54,6 +54,8 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
17 fi
18 ])
19
20+AC_CHECK_FUNCS(explicit_bzero)
21+
22 AC_CHECK_FUNC(signalfd, dummy=yes,
23 AC_MSG_ERROR(signalfd support is required))
24
25--
262.20.1
27
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-build-Fix-a-race-condition.patch b/meta/recipes-connectivity/ofono/ofono/0001-build-Fix-a-race-condition.patch
deleted file mode 100644
index 2e2aa88265..0000000000
--- a/meta/recipes-connectivity/ofono/ofono/0001-build-Fix-a-race-condition.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 3e43e3342f3fada1624a28500a5337019fed7d89 Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@kernel.org>
3Date: Thu, 9 May 2019 12:19:51 +0300
4Subject: build: Fix a race condition
5
6ell/ell.h was written before ell/ existed
7
8Upstream-Status: Backport
9Signed-off-by: Adrian Bunk <bunk@stusta.de>
10---
11 Makefile.am | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/Makefile.am b/Makefile.am
15index a569c4a3..d2e310d5 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -1107,6 +1107,7 @@ ell/internal: Makefile
19 done > $@
20
21 ell/ell.h: Makefile
22+ $(AM_V_at)$(MKDIR_P) ell
23 $(AM_V_at)echo -n > $@
24 $(AM_V_GEN)for f in $(ell_headers) ; do \
25 echo "#include <$$f>" >> $@ ; \
26--
272.20.1
28
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-main-Quiet-ld-errors-with-external-ell.patch b/meta/recipes-connectivity/ofono/ofono/0001-main-Quiet-ld-errors-with-external-ell.patch
deleted file mode 100644
index f9858e7f20..0000000000
--- a/meta/recipes-connectivity/ofono/ofono/0001-main-Quiet-ld-errors-with-external-ell.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 48e31f9fc3cf3c486c3d27a67b2687f6df0c5c71 Mon Sep 17 00:00:00 2001
2From: Denis Kenzior <denkenz@gmail.com>
3Date: Thu, 16 May 2019 15:10:53 -0500
4Subject: main: Quiet ld errors with external ell
5
6When oFono is built with --enable-external-ell, the compiler for some
7reason does not generate a debug section on some systems. This is due
8to the fact that l_debug is never called. However, ell also does not
9call l_debug, yet when built-in ell is used, the section is created by
10the compiler.
11
12For now work around this by adding a no-op l_debug() call in main.c.
13The real fix is to migrate all of the oFono logging functionality to use
14ell instead.
15
16Upstream-Status: Backport
17Signed-off-by: Adrian Bunk <bunk@stusta.de>
18---
19 src/main.c | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/src/main.c b/src/main.c
23index 8623a060..4529cde1 100644
24--- a/src/main.c
25+++ b/src/main.c
26@@ -236,6 +236,7 @@ int main(int argc, char **argv)
27 event_loop = g_main_loop_new(NULL, FALSE);
28
29 l_log_set_stderr();
30+ l_debug("");
31 l_debug_enable("*");
32 l_main_init();
33
34--
352.20.1
36
diff --git a/meta/recipes-connectivity/ofono/ofono_1.29.bb b/meta/recipes-connectivity/ofono/ofono_1.29.bb
deleted file mode 100644
index 900a6d26d9..0000000000
--- a/meta/recipes-connectivity/ofono/ofono_1.29.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require ofono.inc
2
3SRC_URI = "\
4 ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
5 file://ofono \
6 file://0001-build-Fix-a-race-condition.patch \
7 file://0001-build-Add-check-for-explicit_bzero-support.patch \
8 file://0001-main-Quiet-ld-errors-with-external-ell.patch \
9 file://0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch \
10 file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \
11"
12SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8"
13SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.30.bb b/meta/recipes-connectivity/ofono/ofono_1.30.bb
new file mode 100644
index 0000000000..c916cb1b22
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono_1.30.bb
@@ -0,0 +1,9 @@
1require ofono.inc
2
3SRC_URI = "\
4 ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
5 file://ofono \
6 file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \
7"
8SRC_URI[md5sum] = "2b1ce11a4db1f4b5c8cd96eb7e96ba0c"
9SRC_URI[sha256sum] = "8079735efc5d7f33be9e792e791f2f7ff75c31ce67d477b994673e32319eec5c"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 07:47:58 +0000