All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ofono: upgrade 1.25 -> 1.29
@ 2019-05-07 13:11 Adrian Bunk
  2019-05-08 12:32 ` Richard Purdie
  0 siblings, 1 reply; 4+ messages in thread
From: Adrian Bunk @ 2019-05-07 13:11 UTC (permalink / raw)
  To: openembedded-core

Remove patch applied upstream.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
 .../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

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 @@
-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
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 @@
-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"
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..d026ae6f3b
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono_1.29.bb
@@ -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"
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] ofono: upgrade 1.25 -> 1.29
  2019-05-07 13:11 [PATCH] ofono: upgrade 1.25 -> 1.29 Adrian Bunk
@ 2019-05-08 12:32 ` Richard Purdie
  2019-05-08 12:48   ` Richard Purdie
  0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2019-05-08 12:32 UTC (permalink / raw)
  To: Adrian Bunk, openembedded-core

On Tue, 2019-05-07 at 16:11 +0300, Adrian Bunk wrote:
> Remove patch applied upstream.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> ---
>  .../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



^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] ofono: upgrade 1.25 -> 1.29
  2019-05-08 12:32 ` Richard Purdie
@ 2019-05-08 12:48   ` Richard Purdie
  2019-05-08 20:00     ` Adrian Bunk
  0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2019-05-08 12:48 UTC (permalink / raw)
  To: Adrian Bunk, openembedded-core

On Wed, 2019-05-08 at 13:32 +0100, Richard Purdie wrote:
> On Tue, 2019-05-07 at 16:11 +0300, Adrian Bunk wrote:
> > Remove patch applied upstream.
> > 
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> > ---
> >  .../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:

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



^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] ofono: upgrade 1.25 -> 1.29
  2019-05-08 12:48   ` Richard Purdie
@ 2019-05-08 20:00     ` Adrian Bunk
  0 siblings, 0 replies; 4+ messages in thread
From: Adrian Bunk @ 2019-05-08 20:00 UTC (permalink / raw)
  To: Richard Purdie; +Cc: openembedded-core

On Wed, May 08, 2019 at 01:48:14PM +0100, Richard Purdie wrote:
> On Wed, 2019-05-08 at 13:32 +0100, Richard Purdie wrote:
> > On Tue, 2019-05-07 at 16:11 +0300, Adrian Bunk wrote:
> > > Remove patch applied upstream.
> > > 
> > > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> > > ---
> > >  .../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:
> 
> 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.

> Cheers,
> 
> Richard

cu
Adrian

-- 

       "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



^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-08 20:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-07 13:11 [PATCH] ofono: upgrade 1.25 -> 1.29 Adrian Bunk
2019-05-08 12:32 ` Richard Purdie
2019-05-08 12:48   ` Richard Purdie
2019-05-08 20:00     ` Adrian Bunk

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.