Skip to contentSkip to conversation

ofono: upgrade 1.25 -> 1.29

PATCH Superseded Adrian Bunk 2 participants 3 messages May 8, 2019 – May 9, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ofono: upgrade 1.25 -> 1.29

Remove patch applied upstream.
Fix a new parallel build failure.

---
 ...a-race-condition-where-ell-ell.h-was.patch | 28 +++++++++++++++++++
 .../ofono/ofono/use-python3.patch             | 27 ------------------
 meta/recipes-connectivity/ofono/ofono_1.25.bb |  9 ------
 meta/recipes-connectivity/ofono/ofono_1.29.bb |  9 ++++++
 4 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Fix-a-race-condition-where-ell-ell.h-was.patch
 delete mode 100644 meta/recipes-connectivity/ofono/ofono/use-python3.patch
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_1.25.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_1.29.bb
meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Fix-a-race-condition-where-ell-ell.h-was.patch new file +28 -0
new file mode 100644
index 0000000000..1dfc977add
@@ -0,0 +1,28 @@
+From 61c78979eab39ead47a91aeacad43ad72d162052 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <[email protected]>
+Date: Wed, 8 May 2019 21:58:44 +0300
+Subject: Makefile.am: Fix a race condition where ell/ell.h was written before
+ ell/ existed
+
+Signed-off-by: Adrian Bunk <[email protected]>
+Upstream-Status: Pending
+
+---
+ 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
+
meta/recipes-connectivity/ofono/ofono/use-python3.patch deleted +0 -27
deleted file mode 100644
index 7b84075257..0000000000
@@ -1,27 +0,0 @@
-set-ddr should use Python3 like all the other tests.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <[email protected]>
-
-From 17b69cd1da4c5c5f732acb38ca1602446c567ee7 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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
meta/recipes-connectivity/ofono/ofono_1.25.bb deleted +0 -9
deleted file mode 100644
index 3688b9d2fc..0000000000
@@ -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"
meta/recipes-connectivity/ofono/ofono_1.29.bb new file +9 -0
new file mode 100644
index 0000000000..8539aa1372
@@ -0,0 +1,9 @@
+require ofono.inc
+
+SRC_URI  = "\
+  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+  file://ofono \
+  file://0001-Makefile.am-Fix-a-race-condition-where-ell-ell.h-was.patch \
+"
+SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8"
+SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679"
Signature · 1 line
2.17.1
#1 lore raw

This is failing with error:

| In file included from ../ofono-1.29/ell/random.c:34:
| ../ofono-1.29/ell/missing.h:59:20: error: static declaration of 'explicit_bzero' follows non-static declaration

|  static inline void explicit_bzero(void *s, size_t n)
|                     ^~~~~~~~~~~~~~
| In file included from ../ofono-1.29/ell/util.h:26,
|                  from ../ofono-1.29/ell/private.h:26,
|                  from ../ofono-1.29/ell/random.c:33:
| /home/pokybuild/yocto-worker/musl-qemux86-
64/build/build/tmp/work/core2-64-poky-linux-musl/ofono/1.29-r0/recipe-
sysroot/usr/include/string.h:85:6: note: previous declaration of
'explicit_bzero' was here
|  void explicit_bzero (void *, size_t);
|       ^~~~~~~~~~~~~~
| make[1]: *** [ell/random.lo] Error 1
| make[1]: *** Waiting for unfinished jobs....

Logs here:

https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/578/steps/7/logs/step1b

Thanks,

Anuj

Quoted 132 lines · Adrian Bunk

Remove patch applied upstream.
Fix a new parallel build failure.

---
 ...a-race-condition-where-ell-ell.h-was.patch | 28
+++++++++++++++++++
 .../ofono/ofono/use-python3.patch             | 27 ---------------
---
 meta/recipes-connectivity/ofono/ofono_1.25.bb |  9 ------
 meta/recipes-connectivity/ofono/ofono_1.29.bb |  9 ++++++
 4 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 meta/recipes-connectivity/ofono/ofono/0001-
Makefile.am-Fix-a-race-condition-where-ell-ell.h-was.patch
 delete mode 100644 meta/recipes-connectivity/ofono/ofono/use-
python3.patch
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_1.25.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_1.29.bb
(quoted diff) +0 -0

Fix-a-race-condition-where-ell-ell.h-was.patch b/meta/recipes- connectivity/ofono/ofono/0001-Makefile.am-Fix-a-race-condition-where- ell-ell.h-was.patch
new file mode 100644
index 0000000000..1dfc977add

meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Fix-a- new file +0 -0

race-condition-where-ell-ell.h-was.patch

meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Fix-a- new file +1 -0
@@ -0,0 +1,28 @@
+From 61c78979eab39ead47a91aeacad43ad72d162052 Mon Sep 17 00:00:00

2001

meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Fix-a- new file +3 -0
+From: Adrian Bunk <[email protected]>
+Date: Wed, 8 May 2019 21:58:44 +0300
+Subject: Makefile.am: Fix a race condition where ell/ell.h was

written before
+ ell/ existed

meta/recipes-connectivity/ofono/ofono/0001-Makefile.am-Fix-a- new file +23 -0
+
+Signed-off-by: Adrian Bunk <[email protected]>
+Upstream-Status: Pending
+
+---
+ 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
+
meta/recipes-connectivity/ofono/ofono/use-python3.patch deleted +0 -6
deleted file mode 100644
index 7b84075257..0000000000
@@ -1,27 +0,0 @@
-set-ddr should use Python3 like all the other tests.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <[email protected]>
-
-From 17b69cd1da4c5c5f732acb38ca1602446c567ee7 Mon Sep 17 00:00:00

2001

meta/recipes-connectivity/ofono/ofono/use-python3.patch deleted +0 -21
-From: Ross Burton <[email protected]>
-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
meta/recipes-connectivity/ofono/ofono_1.25.bb deleted +0 -9
deleted file mode 100644
index 3688b9d2fc..0000000000
@@ -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"

meta/recipes-connectivity/ofono/ofono_1.29.bb new file +6 -0
new file mode 100644
index 0000000000..8539aa1372
@@ -0,0 +1,9 @@
+require ofono.inc
+
+SRC_URI  = "\
+  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+  file://ofono \
+  file://0001-Makefile.am-Fix-a-race-condition-where-ell-ell.h-

was.patch \
+"

meta/recipes-connectivity/ofono/ofono_1.29.bb new file +2 -0
+SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8"
+SRC_URI[sha256sum] =

"67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679"

Signature · 1 line
2.17.1
#2 lore raw
Quoted 19 lines · Anuj

This is failing with error:

| In file included from ../ofono-1.29/ell/random.c:34:
| ../ofono-1.29/ell/missing.h:59:20: error: static declaration of 'explicit_bzero' follows non-static declaration

|  static inline void explicit_bzero(void *s, size_t n)
|                     ^~~~~~~~~~~~~~
| In file included from ../ofono-1.29/ell/util.h:26,
|                  from ../ofono-1.29/ell/private.h:26,
|                  from ../ofono-1.29/ell/random.c:33:
| /home/pokybuild/yocto-worker/musl-qemux86-
64/build/build/tmp/work/core2-64-poky-linux-musl/ofono/1.29-r0/recipe-
sysroot/usr/include/string.h:85:6: note: previous declaration of
'explicit_bzero' was here
|  void explicit_bzero (void *, size_t);
|       ^~~~~~~~~~~~~~
| make[1]: *** [ell/random.lo] Error 1
| make[1]: *** Waiting for unfinished jobs....
Quoted 3 lines

Logs here:

https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/578/steps/7/logs/step1b

Thanks, got a fix for that one now.

The next problem is that musl does not currently provide TEMP_FAILURE_RETRY, and the correct fix for that will be that I'll try to get this fixed in musl instead of creating yet another copy of the glibc macro.

I'll come back to ofono after that.

Quoted 3 lines

Thanks,

Anuj

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed