@@ -1,4 +1,4 @@
-From 22b52db4842611ac31a356f023fc09595384e2ad Mon Sep 17 00:00:00 2001
+From 4c72571b6dde16406fce49906b0d69aa193adfef Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 23 May 2019 18:11:22 -0700
Subject: [PATCH] mbim: add an optional TEMP_FAILURE_RETRY macro copy
@@ -7,6 +7,7 @@ Fixes build on musl which does not provide this macro
Upstream-Status: Submitted [https://lists.ofono.org/pipermail/ofono/2019-May/019370.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
---
drivers/mbimmodem/mbim-private.h | 9 +++++++++
1 file changed, 9 insertions(+)
@@ -31,6 +32,3 @@ index e159235..51693ea 100644
enum mbim_control_message {
MBIM_OPEN_MSG = 0x1,
MBIM_CLOSE_MSG = 0x2,
-2.21.0
-
@@ -1,4 +1,4 @@
-From 76e4054801350ebd4a44057379431a33d460ad0f Mon Sep 17 00:00:00 2001
+From 79f62dd09cb33ac5022cfa28a967dc482749c725 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 21 Apr 2021 11:01:34 +0000
Subject: [PATCH] mbim: Fix build with ell-0.39 by restoring unlikely macro
@@ -7,12 +7,13 @@ Subject: [PATCH] mbim: Fix build with ell-0.39 by restoring unlikely macro
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
---
drivers/mbimmodem/mbim-private.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h
-index 51693eae..d917312c 100644
+index 51693ea..d917312 100644
--- a/drivers/mbimmodem/mbim-private.h
+++ b/drivers/mbimmodem/mbim-private.h
@@ -30,6 +30,10 @@
similarity index 95%
rename from meta/recipes-connectivity/ofono/ofono_2.3.bb
rename to meta/recipes-connectivity/ofono/ofono_2.4.bb
@@ -13,7 +13,7 @@ SRC_URI = "\
file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \
file://0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch \
"
-SRC_URI[sha256sum] = "658f9c16aec09c56bd36424982afc6ef292c0942b3a9e8ffefdda5974f01dac3"
+SRC_URI[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d"
inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *ofono* to *2.4* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-ofono-upgrade-2.3-2.4.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 804bfba72b8b9f8b0cd256d2885ece0701ab06ec Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Thu, 15 Feb 2024 05:41:02 +0000 Subject: [PATCH] ofono: upgrade 2.3 -> 2.4 --- ...mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch | 6 ++---- ...im-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch | 5 +++-- .../ofono/{ofono_2.3.bb => ofono_2.4.bb} | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) rename meta/recipes-connectivity/ofono/{ofono_2.3.bb => ofono_2.4.bb} (95%)