summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-16 11:56:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-17 07:07:28 +0100
commit797916f93af161cfb6d89ede32dfc045c4850cdb (patch)
treeed77879714093ee6c054699a349b1d1337b1ca9d /meta/recipes-connectivity
parent737d9aa3c0067216dba48130c9de133451166a24 (diff)
downloadpoky-797916f93af161cfb6d89ede32dfc045c4850cdb.tar.gz
ofono: upgrade 1.25 -> 1.29
Remove patch applied upstream. Backport two fixes for build failures (From OE-Core rev: 8a6ef2044c912d58f3d3bfed614363799a341110) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-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/use-python3.patch27
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.25.bb9
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.29.bb10
5 files changed, 65 insertions, 36 deletions
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
new file mode 100644
index 0000000000..4676bb7668
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono/0001-build-Add-check-for-explicit_bzero-support.patch
@@ -0,0 +1,27 @@
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
new file mode 100644
index 0000000000..2e2aa88265
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono/0001-build-Fix-a-race-condition.patch
@@ -0,0 +1,28 @@
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/use-python3.patch b/meta/recipes-connectivity/ofono/ofono/use-python3.patch
deleted file mode 100644
index 7b84075257..0000000000
--- a/meta/recipes-connectivity/ofono/ofono/use-python3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1set-ddr should use Python3 like all the other tests.
2
3Upstream-Status: Submitted
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 17b69cd1da4c5c5f732acb38ca1602446c567ee7 Mon Sep 17 00:00:00 2001
7From: Ross Burton <ross.burton@intel.com>
8Date: Mon, 29 Jan 2018 11:31:25 +0000
9Subject: [PATCH] test/setddr: use Python 3
10
11All the other tests use Python 3, so this should to.
12---
13 test/set-ddr | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/test/set-ddr b/test/set-ddr
17index 5d061b95..33631f31 100755
18--- a/test/set-ddr
19+++ b/test/set-ddr
20@@ -1,4 +1,4 @@
21-#!/usr/bin/python
22+#!/usr/bin/python3
23
24 import sys
25 import dbus
26--
272.11.0
diff --git a/meta/recipes-connectivity/ofono/ofono_1.25.bb b/meta/recipes-connectivity/ofono/ofono_1.25.bb
deleted file mode 100644
index 3688b9d2fc..0000000000
--- a/meta/recipes-connectivity/ofono/ofono_1.25.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require ofono.inc
2
3SRC_URI = "\
4 ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
5 file://ofono \
6 file://use-python3.patch \
7"
8SRC_URI[md5sum] = "31450cabdd8dbbf3f808ea2f2f066863"
9SRC_URI[sha256sum] = "eb011fcd3080e93f3a56f96be60350b6595a8b5f36b61646312ba41b0bcb0d75"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.29.bb b/meta/recipes-connectivity/ofono/ofono_1.29.bb
new file mode 100644
index 0000000000..a22b99a728
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono_1.29.bb
@@ -0,0 +1,10 @@
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"
9SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8"
10SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679"