diff options
Diffstat (limited to 'external/poky/meta/recipes-connectivity/ofono/ofono')
2 files changed, 36 insertions, 27 deletions
diff --git a/external/poky/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch b/external/poky/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch new file mode 100644 index 00000000..8a5a300a --- /dev/null +++ b/external/poky/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch @@ -0,0 +1,36 @@ +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/external/poky/meta/recipes-connectivity/ofono/ofono/use-python3.patch b/external/poky/meta/recipes-connectivity/ofono/ofono/use-python3.patch deleted file mode 100644 index 7b840752..00000000 --- a/external/poky/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 |