diff options
Diffstat (limited to 'meta')
-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_1.31.bb | 10 |
2 files changed, 36 insertions, 2 deletions
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 new file mode 100644 index 0000000000..3655b3fd66 --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch | |||
@@ -0,0 +1,28 @@ | |||
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_1.31.bb b/meta/recipes-connectivity/ofono/ofono_1.31.bb index 7d0976ad7f..2425ef76a6 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.31.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.31.bb | |||
@@ -11,6 +11,7 @@ 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 \ | 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 \ | ||
14 | " | 15 | " |
15 | SRC_URI[md5sum] = "1c26340e3c6ed132cc812595081bb3dc" | 16 | SRC_URI[md5sum] = "1c26340e3c6ed132cc812595081bb3dc" |
16 | SRC_URI[sha256sum] = "a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b" | 17 | SRC_URI[sha256sum] = "a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b" |
@@ -30,9 +31,14 @@ PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" | |||
30 | 31 | ||
31 | EXTRA_OECONF += "--enable-test --enable-external-ell" | 32 | EXTRA_OECONF += "--enable-test --enable-external-ell" |
32 | 33 | ||
34 | do_configure_prepend() { | ||
35 | bbnote "Removing bundled ell from ${S}/ell to prevent including it" | ||
36 | rm -rf ${S}/ell | ||
37 | } | ||
38 | |||
33 | do_install_append() { | 39 | do_install_append() { |
34 | install -d ${D}${sysconfdir}/init.d/ | 40 | install -d ${D}${sysconfdir}/init.d/ |
35 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono | 41 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono |
36 | } | 42 | } |
37 | 43 | ||
38 | PACKAGES =+ "${PN}-tests" | 44 | PACKAGES =+ "${PN}-tests" |