diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-17 10:56:14 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-22 07:24:51 +0100 |
commit | bcf0c5b7a218e35eb5fc92364b42b4b8144bcdc7 (patch) | |
tree | 5760457403da1e5946d63bedf5e854d677d64abb /meta | |
parent | a35abe31dc23916fd06afdb3a5e22a81ef3df579 (diff) | |
download | poky-bcf0c5b7a218e35eb5fc92364b42b4b8144bcdc7.tar.gz |
ofono: Use external ell instead of an internal copy
(From OE-Core rev: 3683f524dc60325b3f3b1bc3a32e70a41064ae03)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 39 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index 0472414b19..e1185c6e6b 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | |||
7 | 7 | ||
8 | inherit autotools pkgconfig update-rc.d systemd bluetooth gobject-introspection-data | 8 | inherit autotools pkgconfig update-rc.d systemd bluetooth gobject-introspection-data |
9 | 9 | ||
10 | DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info" | 10 | DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" |
11 | 11 | ||
12 | INITSCRIPT_NAME = "ofono" | 12 | INITSCRIPT_NAME = "ofono" |
13 | INITSCRIPT_PARAMS = "defaults 22" | 13 | INITSCRIPT_PARAMS = "defaults 22" |
@@ -19,7 +19,7 @@ PACKAGECONFIG ??= "\ | |||
19 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" | 19 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" |
20 | PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" | 20 | PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" |
21 | 21 | ||
22 | EXTRA_OECONF += "--enable-test" | 22 | EXTRA_OECONF += "--enable-test --enable-external-ell" |
23 | 23 | ||
24 | SYSTEMD_SERVICE_${PN} = "ofono.service" | 24 | SYSTEMD_SERVICE_${PN} = "ofono.service" |
25 | 25 | ||
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-main-Quiet-ld-errors-with-external-ell.patch b/meta/recipes-connectivity/ofono/ofono/0001-main-Quiet-ld-errors-with-external-ell.patch new file mode 100644 index 0000000000..f9858e7f20 --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/0001-main-Quiet-ld-errors-with-external-ell.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 48e31f9fc3cf3c486c3d27a67b2687f6df0c5c71 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denis Kenzior <denkenz@gmail.com> | ||
3 | Date: Thu, 16 May 2019 15:10:53 -0500 | ||
4 | Subject: main: Quiet ld errors with external ell | ||
5 | |||
6 | When oFono is built with --enable-external-ell, the compiler for some | ||
7 | reason does not generate a debug section on some systems. This is due | ||
8 | to the fact that l_debug is never called. However, ell also does not | ||
9 | call l_debug, yet when built-in ell is used, the section is created by | ||
10 | the compiler. | ||
11 | |||
12 | For now work around this by adding a no-op l_debug() call in main.c. | ||
13 | The real fix is to migrate all of the oFono logging functionality to use | ||
14 | ell instead. | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
18 | --- | ||
19 | src/main.c | 1 + | ||
20 | 1 file changed, 1 insertion(+) | ||
21 | |||
22 | diff --git a/src/main.c b/src/main.c | ||
23 | index 8623a060..4529cde1 100644 | ||
24 | --- a/src/main.c | ||
25 | +++ b/src/main.c | ||
26 | @@ -236,6 +236,7 @@ int main(int argc, char **argv) | ||
27 | event_loop = g_main_loop_new(NULL, FALSE); | ||
28 | |||
29 | l_log_set_stderr(); | ||
30 | + l_debug(""); | ||
31 | l_debug_enable("*"); | ||
32 | l_main_init(); | ||
33 | |||
34 | -- | ||
35 | 2.20.1 | ||
36 | |||
diff --git a/meta/recipes-connectivity/ofono/ofono_1.29.bb b/meta/recipes-connectivity/ofono/ofono_1.29.bb index a22b99a728..a5fa81de2f 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.29.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.29.bb | |||
@@ -5,6 +5,7 @@ SRC_URI = "\ | |||
5 | file://ofono \ | 5 | file://ofono \ |
6 | file://0001-build-Fix-a-race-condition.patch \ | 6 | file://0001-build-Fix-a-race-condition.patch \ |
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 | " | 9 | " |
9 | SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8" | 10 | SRC_URI[md5sum] = "4fa0372630ff03f223452e4d05efa8f8" |
10 | SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679" | 11 | SRC_URI[sha256sum] = "67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679" |