bluez5_utils: allow install of deprecated tools

Since BlueZ 5.44 many command line tools are deprecated, among them
gatttool. Add an option to install these tools.

Remove the gatttool specific option, since it is redundant now.

Fixes:
http://autobuild.buildroot.net/results/ddb/ddb975c9e1475fee1da63cb21240d8d59b161076/
http://autobuild.buildroot.net/results/19a/19adc0aa5a7e48119ef4ba25ba0403867f74f678/
http://autobuild.buildroot.net/results/9bd/9bd8e13ddffdd0631ddca30ec40cc4664729b0cb/

Cc: Marcin Bis <marcin@bis.org.pl>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index 98b9eeb84fc2c38d35441130b17aa4856e1305e3..bc14bf2a61da41ca2518c6ec10897d1c5b5a9bad 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,15 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.05"
 
+config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL
+       bool "bluez5_utils gatttool install option removed"
+       select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
+       help
+         The option to install gatttool specifically has been removed.
+         Since version 5.44 gatttool is in the list of deprecated
+         tools. The option to build and install deprecated tools has
+         been automatically enabled.
+
 config BR2_PACKAGE_OPENOCD_FT2XXX
        bool "openocd ft2232 support has been removed"
        select BR2_PACKAGE_OPENOCD_FTDI

diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
index 3611c6971a6d03f48ec205f3f70c17f4f7f44592..285560aee9bed0c1f501962cffddce4b5cb43fd3 100644 (file)
--- a/package/bluez5_utils/Config.in
+++ b/package/bluez5_utils/Config.in
@@ -48,16 +48,13 @@ config BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
 comment "bluez5-utils client needs a glibc or musl toolchain"
        depends on BR2_TOOLCHAIN_USES_UCLIBC
 
-config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL
-       bool "install GATT tool"
+config BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
+       bool "install deprecated tool"
        depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
        help
-         Generic Attribute Profile (GATT) support. This provides
-         profile discovery and description services for Bluetooth Low
-         Energy. This will install the gatttool utility.
-
-         It is always built with BlueZ 5.x, but upstream choose not
-         to install it by default.
+         Build BlueZ 5.x deprecated tools. These currently include:
+         hciattach, hciconfig, hcitool, hcidump, rfcomm, sdptool,
+         ciptool, gatttool.
 
 config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
        bool "build experimental plugins"

diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
index aaefcb6ace9b558bd85afc92a468264e9591cf35..fac79580024fdc435ca5f8ef8143255470f7e704 100644 (file)
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -46,11 +46,14 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis
 endif
 
 # install gatttool (For some reason upstream choose not to do it by default)
-ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED),y)
 define BLUEZ5_UTILS_INSTALL_GATTTOOL
        $(INSTALL) -D -m 0755 $(@D)/attrib/gatttool $(TARGET_DIR)/usr/bin/gatttool
 endef
 BLUEZ5_UTILS_POST_INSTALL_TARGET_HOOKS += BLUEZ5_UTILS_INSTALL_GATTTOOL
+BLUEZ5_UTILS_CONF_OPTS += --enable-deprecated
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-deprecated
 endif
 
 # enable test