* [Buildroot] [PATCH 1/4] bluez5_utils: allow install of deprecated tools
2017-05-01 12:59 [Buildroot] [PATCH 0/4] bluez5_utils: version bump fixes and updates Baruch Siach
@ 2017-05-01 12:59 ` Baruch Siach
2017-05-01 14:57 ` Thomas Petazzoni
2017-05-05 12:32 ` Peter Korsgaard
2017-05-01 12:59 ` [Buildroot] [PATCH 2/4] bluez5_utils: correct the experimental option text Baruch Siach
` (3 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Baruch Siach @ 2017-05-01 12:59 UTC (permalink / raw)
To: buildroot
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>
---
Config.in.legacy | 9 +++++++++
package/bluez5_utils/Config.in | 13 +++++--------
package/bluez5_utils/bluez5_utils.mk | 5 ++++-
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 98b9eeb84fc2..bc14bf2a61da 100644
--- 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 3611c6971a6d..285560aee9be 100644
--- 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 aaefcb6ace9b..fac79580024f 100644
--- 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
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 1/4] bluez5_utils: allow install of deprecated tools
2017-05-01 12:59 ` [Buildroot] [PATCH 1/4] bluez5_utils: allow install of deprecated tools Baruch Siach
@ 2017-05-01 14:57 ` Thomas Petazzoni
2017-05-01 15:09 ` Baruch Siach
2017-05-05 12:32 ` Peter Korsgaard
1 sibling, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2017-05-01 14:57 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 1 May 2017 15:59:41 +0300, Baruch Siach wrote:
> -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
So the --enable-deprecated option only enables the build of gatttool ?
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/4] bluez5_utils: allow install of deprecated tools
2017-05-01 14:57 ` Thomas Petazzoni
@ 2017-05-01 15:09 ` Baruch Siach
0 siblings, 0 replies; 12+ messages in thread
From: Baruch Siach @ 2017-05-01 15:09 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Mon, May 01, 2017 at 04:57:50PM +0200, Thomas Petazzoni wrote:
> On Mon, 1 May 2017 15:59:41 +0300, Baruch Siach wrote:
>
> > -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
>
> So the --enable-deprecated option only enables the build of gatttool ?
No. It enables all deprecated tools. But for all other tools bluez does the
installation as well. Only gatttool needs manual installation like before.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/4] bluez5_utils: allow install of deprecated tools
2017-05-01 12:59 ` [Buildroot] [PATCH 1/4] bluez5_utils: allow install of deprecated tools Baruch Siach
2017-05-01 14:57 ` Thomas Petazzoni
@ 2017-05-05 12:32 ` Peter Korsgaard
1 sibling, 0 replies; 12+ messages in thread
From: Peter Korsgaard @ 2017-05-05 12:32 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> 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>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/4] bluez5_utils: correct the experimental option text
2017-05-01 12:59 [Buildroot] [PATCH 0/4] bluez5_utils: version bump fixes and updates Baruch Siach
2017-05-01 12:59 ` [Buildroot] [PATCH 1/4] bluez5_utils: allow install of deprecated tools Baruch Siach
@ 2017-05-01 12:59 ` Baruch Siach
2017-05-05 12:37 ` Peter Korsgaard
2017-05-01 12:59 ` [Buildroot] [PATCH 3/4] bluez5_utils: allow enabling formerly experimental plugins Baruch Siach
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Baruch Siach @ 2017-05-01 12:59 UTC (permalink / raw)
To: buildroot
In BlueZ 5.44 the --enable-experimental configure option only controls the
build of the Nokia OBEX PC Suite plugin. Correct the option prompt and help
text.
Cc: Marcin Bis <marcin@bis.org.pl>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/bluez5_utils/Config.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
index 285560aee9be..f8e3540ec5e9 100644
--- a/package/bluez5_utils/Config.in
+++ b/package/bluez5_utils/Config.in
@@ -57,9 +57,9 @@ config BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
ciptool, gatttool.
config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
- bool "build experimental plugins"
+ bool "build experimental obexd plugin"
help
- Build BlueZ 5.x experimental plugins (SAP, NFC, ...).
+ Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin
config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
bool "build sixaxis plugin"
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 3/4] bluez5_utils: allow enabling formerly experimental plugins
2017-05-01 12:59 [Buildroot] [PATCH 0/4] bluez5_utils: version bump fixes and updates Baruch Siach
2017-05-01 12:59 ` [Buildroot] [PATCH 1/4] bluez5_utils: allow install of deprecated tools Baruch Siach
2017-05-01 12:59 ` [Buildroot] [PATCH 2/4] bluez5_utils: correct the experimental option text Baruch Siach
@ 2017-05-01 12:59 ` Baruch Siach
2017-05-05 12:37 ` Peter Korsgaard
2017-05-01 12:59 ` [Buildroot] [PATCH 4/4] bluez5_utils: allow building the midi profile Baruch Siach
2017-05-02 15:05 ` [Buildroot] [PATCH 0/4] bluez5_utils: version bump fixes and updates Andy Shevchenko
4 siblings, 1 reply; 12+ messages in thread
From: Baruch Siach @ 2017-05-01 12:59 UTC (permalink / raw)
To: buildroot
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Disregard to increase just minor version BlueZ 5.44 is drastically different in
a way what plugins that used to be enabled by the --enable-experimental
configure option, now have their own option.
Extend Buildroot package to cover these plugins.
Cc: Marcin Bis <marcin@bis.org.pl>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/bluez5_utils/Config.in | 15 +++++++++++++++
package/bluez5_utils/bluez5_utils.mk | 21 +++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
index f8e3540ec5e9..181003b42c9b 100644
--- a/package/bluez5_utils/Config.in
+++ b/package/bluez5_utils/Config.in
@@ -61,6 +61,21 @@ config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
help
Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin
+config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
+ bool "build health plugin"
+ help
+ Build BlueZ 5.x health plugin
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
+ bool "build nfc plugin"
+ help
+ Build BlueZ 5.x nfc plugin
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
+ bool "build sap plugin"
+ help
+ Build BlueZ 5.x sap plugin
+
config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
bool "build sixaxis plugin"
depends on BR2_PACKAGE_HAS_UDEV
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
index fac79580024f..431783997d7f 100644
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -38,6 +38,27 @@ else
BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
endif
+# enable health plugin
+ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH),y)
+BLUEZ5_UTILS_CONF_OPTS += --enable-health
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-health
+endif
+
+# enable nfc plugin
+ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y)
+BLUEZ5_UTILS_CONF_OPTS += --enable-nfc
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-nfc
+endif
+
+# enable sap plugin
+ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SAP),y)
+BLUEZ5_UTILS_CONF_OPTS += --enable-sap
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-sap
+endif
+
# enable sixaxis plugin
ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 4/4] bluez5_utils: allow building the midi profile
2017-05-01 12:59 [Buildroot] [PATCH 0/4] bluez5_utils: version bump fixes and updates Baruch Siach
` (2 preceding siblings ...)
2017-05-01 12:59 ` [Buildroot] [PATCH 3/4] bluez5_utils: allow enabling formerly experimental plugins Baruch Siach
@ 2017-05-01 12:59 ` Baruch Siach
2017-05-05 12:37 ` Peter Korsgaard
2017-05-02 15:05 ` [Buildroot] [PATCH 0/4] bluez5_utils: version bump fixes and updates Andy Shevchenko
4 siblings, 1 reply; 12+ messages in thread
From: Baruch Siach @ 2017-05-01 12:59 UTC (permalink / raw)
To: buildroot
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
The midi profile was introduced in BlueZ 5.44.
Cc: Marcin Bis <marcin@bis.org.pl>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/bluez5_utils/Config.in | 7 +++++++
package/bluez5_utils/bluez5_utils.mk | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
index 181003b42c9b..bdb6682c1645 100644
--- a/package/bluez5_utils/Config.in
+++ b/package/bluez5_utils/Config.in
@@ -66,6 +66,13 @@ config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
help
Build BlueZ 5.x health plugin
+config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
+ bool "build midi profile"
+ select BR2_PACKAGE_ALSA_LIB
+ select BR2_PACKAGE_ALSA_LIB_SEQ
+ help
+ Build BlueZ 5.x midi plugin
+
config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
bool "build nfc plugin"
help
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
index 431783997d7f..4a0323488113 100644
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -45,6 +45,14 @@ else
BLUEZ5_UTILS_CONF_OPTS += --disable-health
endif
+# enable midi profile
+ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI),y)
+BLUEZ5_UTILS_CONF_OPTS += --enable-midi
+BLUEZ5_UTILS_DEPENDENCIES += alsa-lib
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-midi
+endif
+
# enable nfc plugin
ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-nfc
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 0/4] bluez5_utils: version bump fixes and updates
2017-05-01 12:59 [Buildroot] [PATCH 0/4] bluez5_utils: version bump fixes and updates Baruch Siach
` (3 preceding siblings ...)
2017-05-01 12:59 ` [Buildroot] [PATCH 4/4] bluez5_utils: allow building the midi profile Baruch Siach
@ 2017-05-02 15:05 ` Andy Shevchenko
4 siblings, 0 replies; 12+ messages in thread
From: Andy Shevchenko @ 2017-05-02 15:05 UTC (permalink / raw)
To: buildroot
On Mon, 2017-05-01 at 15:59 +0300, Baruch Siach wrote:
> The recent bluez5_utils version bump moved around the build options so
> that?
> some builds now fail, and the help text became incorrect. This short
> series?
> fixes some of these issues.
>
Thanks for taking care of this, I appreciate.
I have no time to keep on it right now, so, feel free modify as it
satisfies Thomas and others.
On first glance what you did looks sane to me.
> This series is mostly based on Andy Shevchenko's patch[1] with the
> following?
> main changes:
>
> ? * Split out the DEPRECATED handling, adding a fix to the gatttool
> build?
> ????issue in the process
>
> ? * Remove the redundant BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL config
> option
>
> ? * Split the option addition patch into two: one for options that
> were?
> ????previously under --enable-experimental, and one for the newly
> introduced?
> ????midi profile
>
> ? * Add missing BR2_PACKAGE_ALSA_LIB_SEQ select
>
> [1] https://patchwork.ozlabs.org/patch/741645/
>
> Andy Shevchenko (2):
> ? bluez5_utils: allow enabling formerly experimental plugins
> ? bluez5_utils: allow building the midi profile
>
> Baruch Siach (2):
> ? bluez5_utils: allow install of deprecated tools
> ? bluez5_utils: correct the experimental option text
>
> ?Config.in.legacy?????????????????????|??9 +++++++++
> ?package/bluez5_utils/Config.in???????| 39
> +++++++++++++++++++++++++++---------
> ?package/bluez5_utils/bluez5_utils.mk | 34
> ++++++++++++++++++++++++++++++-
> ?3 files changed, 71 insertions(+), 11 deletions(-)
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 12+ messages in thread