diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-05-23 21:26:59 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-27 17:06:34 +0100 |
commit | 9fc14c7866298bcde461ac165f86326d571ca89a (patch) | |
tree | 106ac778f39111359a3a65af50f3acfb07dec74f /meta/recipes-connectivity | |
parent | 274f038d3eeced911d711e3bcacabab3408ac8fe (diff) | |
download | poky-9fc14c7866298bcde461ac165f86326d571ca89a.tar.gz |
ofono: Add TEMP_FAILURE_RETRY optional definition
Fixes build with musl where TEMP_FAILURE_RETRY is not provided
(From OE-Core rev: 2a6c1c33bcf061f65da159d66fae78b31bcc9e60)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch | 36 | ||||
-rw-r--r-- | meta/recipes-connectivity/ofono/ofono_1.29.bb | 1 |
2 files changed, 37 insertions, 0 deletions
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 new file mode 100644 index 0000000000..8a5a300adc --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 22b52db4842611ac31a356f023fc09595384e2ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 23 May 2019 18:11:22 -0700 | ||
4 | Subject: [PATCH] mbim: add an optional TEMP_FAILURE_RETRY macro copy | ||
5 | |||
6 | Fixes build on musl which does not provide this macro | ||
7 | |||
8 | Upstream-Status: Submitted [https://lists.ofono.org/pipermail/ofono/2019-May/019370.html] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | drivers/mbimmodem/mbim-private.h | 9 +++++++++ | ||
12 | 1 file changed, 9 insertions(+) | ||
13 | |||
14 | diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h | ||
15 | index e159235..51693ea 100644 | ||
16 | --- a/drivers/mbimmodem/mbim-private.h | ||
17 | +++ b/drivers/mbimmodem/mbim-private.h | ||
18 | @@ -21,6 +21,15 @@ | ||
19 | |||
20 | #define align_len(len, boundary) (((len)+(boundary)-1) & ~((boundary)-1)) | ||
21 | |||
22 | +#ifndef TEMP_FAILURE_RETRY | ||
23 | +#define TEMP_FAILURE_RETRY(expression) ({ \ | ||
24 | + __typeof(expression) __result; \ | ||
25 | + do { \ | ||
26 | + __result = (expression); \ | ||
27 | + } while (__result == -1 && errno == EINTR); \ | ||
28 | + __result; }) | ||
29 | +#endif | ||
30 | + | ||
31 | enum mbim_control_message { | ||
32 | MBIM_OPEN_MSG = 0x1, | ||
33 | MBIM_CLOSE_MSG = 0x2, | ||
34 | -- | ||
35 | 2.21.0 | ||
36 | |||
diff --git a/meta/recipes-connectivity/ofono/ofono_1.29.bb b/meta/recipes-connectivity/ofono/ofono_1.29.bb index b5838e19bf..900a6d26d9 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.29.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.29.bb | |||
@@ -7,6 +7,7 @@ SRC_URI = "\ | |||
7 | file://0001-build-Add-check-for-explicit_bzero-support.patch \ | 7 | file://0001-build-Add-check-for-explicit_bzero-support.patch \ |
8 | file://0001-main-Quiet-ld-errors-with-external-ell.patch \ | 8 | file://0001-main-Quiet-ld-errors-with-external-ell.patch \ |
9 | file://0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch \ | 9 | file://0001-Makefile.am-Don-t-overwrite-src_ofonod_DEPENDENCIES.patch \ |
10 | file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8" | 12 | SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8" |
12 | SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679" | 13 | SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679" |