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>
This commit is contained in:
Adrian Bunk
2019-05-16 11:56:36 +03:00
committed by Richard Purdie
parent 737d9aa3c0
commit 797916f93a
5 changed files with 65 additions and 36 deletions

View File

@@ -0,0 +1,27 @@
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

View File

@@ -0,0 +1,28 @@
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

View File

@@ -1,27 +0,0 @@
set-ddr should use Python3 like all the other tests.
Upstream-Status: Submitted
Signed-off-by: Ross Burton <ross.burton@intel.com>
From 17b69cd1da4c5c5f732acb38ca1602446c567ee7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Mon, 29 Jan 2018 11:31:25 +0000
Subject: [PATCH] test/setddr: use Python 3
All the other tests use Python 3, so this should to.
---
test/set-ddr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/set-ddr b/test/set-ddr
index 5d061b95..33631f31 100755
--- a/test/set-ddr
+++ b/test/set-ddr
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import sys
import dbus
--
2.11.0

View File

@@ -1,9 +0,0 @@
require ofono.inc
SRC_URI = "\
${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
file://ofono \
file://use-python3.patch \
"
SRC_URI[md5sum] = "31450cabdd8dbbf3f808ea2f2f066863"
SRC_URI[sha256sum] = "eb011fcd3080e93f3a56f96be60350b6595a8b5f36b61646312ba41b0bcb0d75"

View File

@@ -0,0 +1,10 @@
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 \
"
SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8"
SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679"