summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2020-08-25 10:34:01 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 16:04:37 +0100
commitbc5c367f09a29c8b735b4fd0057cb37f55015808 (patch)
tree56767a77f281b6cd696696cef656e05b2b1b153f /meta
parent0a3b525ad584aef2e77320498e52aa7af8c37954 (diff)
downloadpoky-bc5c367f09a29c8b735b4fd0057cb37f55015808.tar.gz
bluez5: fix builds that require ell support
Shortly after the recipe was updated to add ell as a mesh dependency the way ell was integrated into bluez5 was changed. BlueZ requires ell only for mesh and for btpclient (external test programs). It will be ignored unless either mesh or btpclient are selected. ell can be supplied externally, or it can be copied into the bluez build directory from an existing sibling source directory. Since bitbake builds do not provide a sibling source directory tell bluez to look for it as an external library in the conditions where it's required. (From OE-Core rev: a29eac72da3579edd9eebc3358498146000a491a) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f22b4eba98b3707d7f6daa4277414cecb3e5ee6b) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 150d909d73..f34ba0dce5 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -42,8 +42,8 @@ PACKAGECONFIG[sixaxis] = "--enable-sixaxis,--disable-sixaxis"
42PACKAGECONFIG[tools] = "--enable-tools,--disable-tools" 42PACKAGECONFIG[tools] = "--enable-tools,--disable-tools"
43PACKAGECONFIG[threads] = "--enable-threads,--disable-threads" 43PACKAGECONFIG[threads] = "--enable-threads,--disable-threads"
44PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated" 44PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated"
45PACKAGECONFIG[mesh] = "--enable-mesh,--disable-mesh, json-c ell" 45PACKAGECONFIG[mesh] = "--enable-mesh --enable-external-ell,--disable-mesh, json-c ell"
46PACKAGECONFIG[btpclient] = "--enable-btpclient,--disable-btpclient, ell" 46PACKAGECONFIG[btpclient] = "--enable-btpclient --enable-external-ell,--disable-btpclient, ell"
47PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" 47PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
48 48
49SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ 49SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \