diff options
Diffstat (limited to 'meta/recipes-connectivity/ofono')
-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.4.bb (renamed from meta/recipes-connectivity/ofono/ofono_1.31.bb) | 31 |
2 files changed, 46 insertions, 13 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_2.4.bb index 7d0976ad7f..dae5cc3c25 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.31.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.4.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "open source telephony" | |||
2 | DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono supports speaking to telephony devices through specific drivers, or with generic AT commands." | 2 | DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono supports speaking to telephony devices through specific drivers, or with generic AT commands." |
3 | HOMEPAGE = "http://www.ofono.org" | 3 | HOMEPAGE = "http://www.ofono.org" |
4 | BUGTRACKER = "https://01.org/jira/browse/OF" | 4 | BUGTRACKER = "https://01.org/jira/browse/OF" |
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPL-2.0-only" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ |
7 | file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" | 7 | file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" |
8 | DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" | 8 | DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" |
@@ -11,40 +11,45 @@ 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[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d" |
16 | SRC_URI[sha256sum] = "a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b" | ||
17 | 17 | ||
18 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data | 18 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data |
19 | 19 | ||
20 | INITSCRIPT_NAME = "ofono" | 20 | INITSCRIPT_NAME = "ofono" |
21 | INITSCRIPT_PARAMS = "defaults 22" | 21 | INITSCRIPT_PARAMS = "defaults 22" |
22 | SYSTEMD_SERVICE_${PN} = "ofono.service" | 22 | SYSTEMD_SERVICE:${PN} = "ofono.service" |
23 | 23 | ||
24 | PACKAGECONFIG ??= "\ | 24 | PACKAGECONFIG ??= "\ |
25 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | 25 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
26 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ | 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ |
27 | " | 27 | " |
28 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" | 28 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_system_unitdir}/,--with-systemdunitdir=" |
29 | PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" | 29 | PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" |
30 | 30 | ||
31 | EXTRA_OECONF += "--enable-test --enable-external-ell" | 31 | EXTRA_OECONF += "--enable-test --enable-external-ell" |
32 | 32 | ||
33 | do_install_append() { | 33 | do_configure:prepend() { |
34 | install -d ${D}${sysconfdir}/init.d/ | 34 | bbnote "Removing bundled ell from ${S}/ell to prevent including it" |
35 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono | 35 | rm -rf ${S}/ell |
36 | } | ||
37 | |||
38 | do_install:append() { | ||
39 | install -d ${D}${sysconfdir}/init.d/ | ||
40 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono | ||
36 | } | 41 | } |
37 | 42 | ||
38 | PACKAGES =+ "${PN}-tests" | 43 | PACKAGES =+ "${PN}-tests" |
39 | 44 | ||
40 | FILES_${PN} += "${systemd_unitdir}" | 45 | FILES:${PN} += "${systemd_unitdir}" |
41 | FILES_${PN}-tests = "${libdir}/${BPN}/test" | 46 | FILES:${PN}-tests = "${libdir}/${BPN}/test" |
42 | 47 | ||
43 | RDEPENDS_${PN} += "dbus" | 48 | RDEPENDS:${PN} += "dbus" |
44 | RDEPENDS_${PN}-tests = "\ | 49 | RDEPENDS:${PN}-tests = "\ |
45 | python3-core \ | 50 | python3-core \ |
46 | python3-dbus \ | 51 | python3-dbus \ |
47 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)} \ | 52 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)} \ |
48 | " | 53 | " |
49 | 54 | ||
50 | RRECOMMENDS_${PN} += "kernel-module-tun mobile-broadband-provider-info" | 55 | RRECOMMENDS:${PN} += "kernel-module-tun mobile-broadband-provider-info" |