diff --git a/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch b/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch index 8a5a300adc..f5def3b222 100644 --- a/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch +++ b/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch @@ -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 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 + --- 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 - diff --git a/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch b/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch index 3655b3fd66..eb2573b697 100644 --- a/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch +++ b/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch @@ -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 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 + --- 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 @@ diff --git a/meta/recipes-connectivity/ofono/ofono_2.3.bb b/meta/recipes-connectivity/ofono/ofono_2.4.bb similarity index 95% rename from meta/recipes-connectivity/ofono/ofono_2.3.bb rename to meta/recipes-connectivity/ofono/ofono_2.4.bb index db5c8173de..dae5cc3c25 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.3.bb +++ b/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