[2/2] ofono: upgrade 2.4 -> 2.7

Remove 0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch as
TEMP_FAILURE_RETRY usage has been removed in upstream commit 765c6655
("treewide: Use L_TFR macro").

Remove 0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch
as likely()/unlikely() has been removed in upstream commit dbbbebf9
("mbimmodem: Remove usage of likely and unlikely").

Remove the do_configure:prepend() that purges the bundled ell directory,
as it isn't needed when passing --enable-external-ell in EXTRA_OECONF.

Signed-off-by: Martin Hundebøll <martin@geanix.com>
---
 ...tional-TEMP_FAILURE_RETRY-macro-copy.patch | 36 -------------------
 ...ith-ell-0.39-by-restoring-unlikely-m.patch | 28 ---------------
 .../ofono/{ofono_2.4.bb => ofono_2.7.bb}      |  9 +----
 3 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch
 delete mode 100644 meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch
 rename meta/recipes-connectivity/ofono/{ofono_2.4.bb => ofono_2.7.bb} (82%)

lgtm

On Wed, May 22, 2024 at 2:04 AM Martin Hundeb?ll via
lists.openembedded.org <martin=geanix.com@lists.openembedded.org>
wrote:
>
> Remove 0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch as
> TEMP_FAILURE_RETRY usage has been removed in upstream commit 765c6655
> ("treewide: Use L_TFR macro").
>
> Remove 0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch
> as likely()/unlikely() has been removed in upstream commit dbbbebf9
> ("mbimmodem: Remove usage of likely and unlikely").
>
> Remove the do_configure:prepend() that purges the bundled ell directory,
> as it isn't needed when passing --enable-external-ell in EXTRA_OECONF.
>
> Signed-off-by: Martin Hundebøll <martin@geanix.com>
> ---
>  ...tional-TEMP_FAILURE_RETRY-macro-copy.patch | 36 -------------------
>  ...ith-ell-0.39-by-restoring-unlikely-m.patch | 28 ---------------
>  .../ofono/{ofono_2.4.bb => ofono_2.7.bb}      |  9 +----
>  3 files changed, 1 insertion(+), 72 deletions(-)
>  delete mode 100644 meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch
>  delete mode 100644 meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch
>  rename meta/recipes-connectivity/ofono/{ofono_2.4.bb => ofono_2.7.bb} (82%)
>
> 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
> deleted file mode 100644
> index 8a5a300adc..0000000000
> --- a/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From 22b52db4842611ac31a356f023fc09595384e2ad 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
> -
> -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(+)
> -
> -diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h
> -index e159235..51693ea 100644
> ---- a/drivers/mbimmodem/mbim-private.h
> -+++ b/drivers/mbimmodem/mbim-private.h
> -@@ -21,6 +21,15 @@
> -
> - #define align_len(len, boundary) (((len)+(boundary)-1) & ~((boundary)-1))
> -
> -+#ifndef TEMP_FAILURE_RETRY
> -+#define TEMP_FAILURE_RETRY(expression) ({     \
> -+  __typeof(expression) __result;              \
> -+  do {                                        \
> -+    __result = (expression);                  \
> -+  } while (__result == -1 && errno == EINTR); \
> -+  __result; })
> -+#endif
> -+
> - 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
> deleted file mode 100644
> index 3655b3fd66..0000000000
> --- a/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 76e4054801350ebd4a44057379431a33d460ad0f 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
> - from ell/util.h
> -
> -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
> ---- a/drivers/mbimmodem/mbim-private.h
> -+++ b/drivers/mbimmodem/mbim-private.h
> -@@ -30,6 +30,10 @@
> -   __result; })
> - #endif
> -
> -+/* used to be part of ell/util.h before 0.39:
> -+   https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=2a682421b06e41c45098217a686157f576847021 */
> -+#define unlikely(x) __builtin_expect(!!(x), 0)
> -+
> - enum mbim_control_message {
> -       MBIM_OPEN_MSG = 0x1,
> -       MBIM_CLOSE_MSG = 0x2,
> diff --git a/meta/recipes-connectivity/ofono/ofono_2.4.bb b/meta/recipes-connectivity/ofono/ofono_2.7.bb
> similarity index 82%
> rename from meta/recipes-connectivity/ofono/ofono_2.4.bb
> rename to meta/recipes-connectivity/ofono/ofono_2.7.bb
> index 5e1e5f3b6a..bc1f3efd04 100644
> --- a/meta/recipes-connectivity/ofono/ofono_2.4.bb
> +++ b/meta/recipes-connectivity/ofono/ofono_2.7.bb
> @@ -10,10 +10,8 @@ DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell"
>  SRC_URI = "\
>      ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
>      file://ofono \
> -    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] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d"
> +SRC_URI[sha256sum] = "dabf6ef06b94beaad65253200abe3887046a4e722f4fe373c4264f357ae47ad3"
>
>  inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data
>
> @@ -30,11 +28,6 @@ PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5"
>
>  EXTRA_OECONF += "--enable-test --enable-external-ell"
>
> -do_configure:prepend() {
> -    bbnote "Removing bundled ell from ${S}/ell to prevent including it"
> -    rm -rf ${S}/ell
> -}
> -
>  do_install:append() {
>      install -d ${D}${sysconfdir}/init.d/
>      install -m 0755 ${UNPACKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
> --
> 2.44.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#199693): https://lists.openembedded.org/g/openembedded-core/message/199693
> Mute This Topic: https://lists.openembedded.org/mt/106239535/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>