Skip to contentSkip to conversation

ofono: upgrade 1.25 -> 1.29

PATCH Superseded Adrian Bunk 2 participants 4 messages May 7, 2019 – May 8, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ofono: upgrade 1.25 -> 1.29

Remove patch applied upstream.

---
 .../ofono/ofono/use-python3.patch             | 27 -------------------
 meta/recipes-connectivity/ofono/ofono_1.25.bb |  9 -------
 meta/recipes-connectivity/ofono/ofono_1.29.bb |  8 ++++++
 3 files changed, 8 insertions(+), 36 deletions(-)
 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/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 +8 -0
new file mode 100644
index 0000000000..d026ae6f3b
@@ -0,0 +1,8 @@
+require ofono.inc
+
+SRC_URI  = "\
+  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+  file://ofono \
+"
+SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8"
+SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 13 lines · Adrian Bunk

Remove patch applied upstream.

---
 .../ofono/ofono/use-python3.patch             | 27 ---------------
----
 meta/recipes-connectivity/ofono/ofono_1.25.bb |  9 -------
 meta/recipes-connectivity/ofono/ofono_1.29.bb |  8 ++++++
 3 files changed, 8 insertions(+), 36 deletions(-)
 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

A local build of this failed with what looks like a race:

| ln -s /media/build1/poky/build/tmp/work/core2-64-poky-linux/ofono/1.29-r0/build/../ofono-1.29/include/netmon.h include/ofono/netmon.h
| /media/build1/poky/build/tmp/hosttools/mkdir -p ell
| echo -n > ell/ell.h
| ln -s /media/build1/poky/build/tmp/work/core2-64-poky-linux/ofono/1.29-r0/build/../ofono-1.29/include/lte.h include/ofono/lte.h
| ../ofono-1.29/src/genbuiltin udevng rildev ril infineon ril_intel rilmodem isimodem isiusb n900 u8500 qmimodem gobi mbimmodem mbim atmodem nwmodem swmodem ztemodem iceramodem huaweimodem calypsomodem mbmmodem telitmodem hsomodem ifxmodem stemodem dunmodem hfpmodem speedupmodem ubloxmodem gemaltomodem xmm7modem phonesim cdmamodem g1 wavecom calypso mbm hso zte huawei sierra novatel palmpre ifx ste stemgr caif cinterion gemalto nokia nokiacdma linktop icera alcatel speedup speedupcdma samsung sim900 sim7100 connman telit quectel ublox xmm7xxx  hfp_bluez5 dun_gw_bluez5  bluez5 hfp_ag_bluez5 upower provision cdma_provision file_provision  smart_messaging push_notification allowed_apns > src/builtin.h
| ln -s /media/build1/poky/build/tmp/work/core2-64-poky-linux/ofono/1.29-r0/build/../ofono-1.29/include/ims.h include/ofono/ims.h
| ln -s /media/build1/poky/build/tmp/work/core2-64-poky-linux/ofono/1.29-r0/build/include/version.h include/ofono/version.h
| /bin/bash: ell/ell.h: No such file or directory
| ln -s /media/build1/poky/build/tmp/work/core2-64-poky-linux/ofono/1.29-r0/build/../ofono-1.29/include/storage.h include/ofono/storage.h
| Makefile:5722: recipe for target 'ell/ell.h' failed
| make: *** [ell/ell.h] Error 1
| make: *** Waiting for unfinished jobs....

Cheers,

Richard

#2 lore raw
Quoted 15 lines · Richard Purdie
Quoted 13 lines · Adrian Bunk

Remove patch applied upstream.

---
 .../ofono/ofono/use-python3.patch             | 27 ---------------
----
 meta/recipes-connectivity/ofono/ofono_1.25.bb |  9 -------
 meta/recipes-connectivity/ofono/ofono_1.29.bb |  8 ++++++
 3 files changed, 8 insertions(+), 36 deletions(-)
 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 1 line

A local build of this failed with what looks like a race:

Also on the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/570

I also confirmed that rerunning the compile did succeed confirming it is a race of some kind.

Cheers,

Richard

#3 lore raw
Quoted 16 lines · Richard Purdie
Quoted 15 lines · Richard Purdie
Quoted 13 lines · Adrian Bunk

Remove patch applied upstream.

---
 .../ofono/ofono/use-python3.patch             | 27 ---------------
----
 meta/recipes-connectivity/ofono/ofono_1.25.bb |  9 -------
 meta/recipes-connectivity/ofono/ofono_1.29.bb |  8 ++++++
 3 files changed, 8 insertions(+), 36 deletions(-)
 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 8 lines
Quoted 1 line

A local build of this failed with what looks like a race:

Also on the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/570

I also confirmed that rerunning the compile did succeed confirming it is a race of some kind.

I was now able to reproduce exactly once, but not afterwards...

I'll send a v2 with a fix that matches the error message.

Quoted 3 lines

Cheers,

Richard

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