bluez5: tool changes following 5.87 upgrade

hcidump utility was dropped in BlueZ 5.87 [1], this was previously
picked up by bluez5-bin, but is no longer provided.

btpclient binaries were moved from tools to client/btpclient [2]

[1] - https://github.com/bluez/bluez/commit/a035be775703bba1fa92b25769191ffb37ae4c76
[2] - https://github.com/bluez/bluez/commit/a98f3d5abf14eb6e3ddcbf73c22362020f26e105

Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 8d2e1e8f423e089d5678cecf1b0fc88bb87ef896..6a98d769ddd1bba716c39beb90cc8f346c9067f4 100644 (file)
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
                     file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac"
 DEPENDS = "dbus glib-2.0"
-PROVIDES += "bluez-hcidump"
-RPROVIDES:${PN} += "bluez-hcidump"
 
 PACKAGECONFIG ??= "obex-profiles \
     readline \

diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.87.bb b/meta/recipes-connectivity/bluez5/bluez5_5.87.bb
index 75b765d524461557b454acb96effcdd17426a2d3..687780de219ef170a35bd19fbed8e99a49584a96 100644 (file)
--- a/meta/recipes-connectivity/bluez5/bluez5_5.87.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.87.bb
@@ -74,5 +74,5 @@ NOINST_TOOLS_BT ?= " \
     tools/check-selftest \
     tools/gatt-service \
     profiles/iap/iapd \
-    ${@bb.utils.contains('PACKAGECONFIG', 'btpclient', 'tools/btpclient tools/btpclientctl', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'btpclient', 'client/btpclient/btpclient client/btpclient/btpclientctl', '', d)} \
 "