diff options
Diffstat (limited to 'meta/recipes-connectivity/ofono')
-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/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch | 28 | ||||
-rw-r--r-- | meta/recipes-connectivity/ofono/ofono_2.7.bb (renamed from meta/recipes-connectivity/ofono/ofono_2.4.bb) | 9 |
3 files changed, 1 insertions, 72 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 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 @@ | |||
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/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 @@ | |||
1 | From 76e4054801350ebd4a44057379431a33d460ad0f Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 21 Apr 2021 11:01:34 +0000 | ||
4 | Subject: [PATCH] mbim: Fix build with ell-0.39 by restoring unlikely macro | ||
5 | from ell/util.h | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | drivers/mbimmodem/mbim-private.h | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h | ||
15 | index 51693eae..d917312c 100644 | ||
16 | --- a/drivers/mbimmodem/mbim-private.h | ||
17 | +++ b/drivers/mbimmodem/mbim-private.h | ||
18 | @@ -30,6 +30,10 @@ | ||
19 | __result; }) | ||
20 | #endif | ||
21 | |||
22 | +/* used to be part of ell/util.h before 0.39: | ||
23 | + https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=2a682421b06e41c45098217a686157f576847021 */ | ||
24 | +#define unlikely(x) __builtin_expect(!!(x), 0) | ||
25 | + | ||
26 | enum mbim_control_message { | ||
27 | MBIM_OPEN_MSG = 0x1, | ||
28 | MBIM_CLOSE_MSG = 0x2, | ||
diff --git a/meta/recipes-connectivity/ofono/ofono_2.4.bb b/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" | |||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | 11 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ |
12 | file://ofono \ | 12 | file://ofono \ |
13 | file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ | ||
14 | file://0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch \ | ||
15 | " | 13 | " |
16 | SRC_URI[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d" | 14 | SRC_URI[sha256sum] = "dabf6ef06b94beaad65253200abe3887046a4e722f4fe373c4264f357ae47ad3" |
17 | 15 | ||
18 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data | 16 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data |
19 | 17 | ||
@@ -30,11 +28,6 @@ PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" | |||
30 | 28 | ||
31 | EXTRA_OECONF += "--enable-test --enable-external-ell" | 29 | EXTRA_OECONF += "--enable-test --enable-external-ell" |
32 | 30 | ||
33 | do_configure:prepend() { | ||
34 | bbnote "Removing bundled ell from ${S}/ell to prevent including it" | ||
35 | rm -rf ${S}/ell | ||
36 | } | ||
37 | |||
38 | do_install:append() { | 31 | do_install:append() { |
39 | install -d ${D}${sysconfdir}/init.d/ | 32 | install -d ${D}${sysconfdir}/init.d/ |
40 | install -m 0755 ${UNPACKDIR}/ofono ${D}${sysconfdir}/init.d/ofono | 33 | install -m 0755 ${UNPACKDIR}/ofono ${D}${sysconfdir}/init.d/ofono |