[ptxdist] [PATCH v2 0/5] bluez fixes and version bump to 5.50

[ptxdist] [PATCH v2 0/5] bluez fixes and version bump to 5.50

[Roland Hieber]

Hi,

v1 of this series was here:
https://www.mail-archive.com/ptxdist@pengutronix.de/msg13512.html

I decided to fix some smaller issues with the existing bluez rule first
and did these in separate commits for easier review. These patches can
then also be applied easier to previous PTXdist versions if needed.

Patches 1/5 to 4/5 are therefore new in this v2 series, patch 5/5 has
its own v2 version log.

Roland Hieber (5):
  bluez: fix license string
  bluez: consistently make use of $(ptx/nl)
  bluez: make it possible to disable building the tools
  bluez: rename PTXCONF_BLUEZ{_UTILS -> _TOOLS}* for consistency
  bluez: version bump 5.30 -> 5.50

 rules/bluez.in              | 35 ++++++++++-----
 rules/bluez.make            | 85 +++++++++++++++++++++++--------------
 scripts/migrate/migrate_ptx |  8 ++++
 3 files changed, 86 insertions(+), 42 deletions(-)

-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 1/5] bluez: fix license string

[Roland Hieber]

Fixes: 02aff14f0d6a824609cbcc1410e45 "[bluez] version bump 3.36 -> 4.69"
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 rules/bluez.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/bluez.make b/rules/bluez.make
index de6a1e5ec..246c7eab6 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -23,7 +23,7 @@ BLUEZ_SUFFIX	:= tar.gz
 BLUEZ_URL	:= $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX))
 BLUEZ_SOURCE	:= $(SRCDIR)/$(BLUEZ).$(BLUEZ_SUFFIX)
 BLUEZ_DIR	:= $(BUILDDIR)/$(BLUEZ)
-BLUEZ_LICENSE	:= GPL-2.0-or-later LGPL-2.1-or-later
+BLUEZ_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
 ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
 BLUEZ_DEVPKG	:= NO
 endif
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/5] bluez: consistently make use of $(ptx/nl)

[Roland Hieber]

Prevent the shell from complaining about exceeding the command line
length by adding newlines between the commands.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 rules/bluez.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/bluez.make b/rules/bluez.make
index 246c7eab6..3ca8b9cb7 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -86,7 +86,7 @@ ifdef PTXCONF_BLUEZ_UTILS
 			hciattach hciconfig hcidump hcitool hex2hcd l2ping \
 			l2test mpris-proxy rctest rfcomm sdptool, \
 		$(call install_copy, bluez, 0, 0, 0755, -, \
-			/usr/bin/$(binprogram));)
+			/usr/bin/$(binprogram))$(ptx/nl))
 endif
 
 ifdef PTXCONF_BLUEZ_CLIENT
@@ -100,7 +100,7 @@ ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
 	@$(foreach testdata, service-ftp.xml service-did.xml service-spp.xml \
 			service-record.dtd service-opp.xml, \
 		$(call install_copy, bluez, 0, 0, 0644, -, \
-			/usr/lib/bluez/test/$(testdata));)
+			/usr/lib/bluez/test/$(testdata))$(ptx/nl))
 
 	@$(foreach testprog, list-devices opp-client \
 			simple-endpoint test-alert test-discovery \
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 3/5] bluez: make it possible to disable building the tools

[Roland Hieber]

Until now, PTXCONF_BLUEZ_UTILS only had an effect on which tools were
installed in the targetinstall stage, but it can also be used to disable
the respective configure options in the prepare stage so the tools are
only built when needed.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 rules/bluez.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/bluez.make b/rules/bluez.make
index 3ca8b9cb7..b161d2730 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -43,8 +43,8 @@ BLUEZ_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--enable-threads \
 	--enable-library \
 	--$(call ptx/endis, PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS)-test \
-	--enable-tools \
-	--enable-monitor \
+	--$(call ptx/endis, PTXCONF_BLUEZ_UTILS)-tools \
+	--$(call ptx/endis, PTXCONF_BLUEZ_UTILS)-monitor \
 	--enable-udev \
 	--disable-cups \
 	--disable-obex \
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 4/5] bluez: rename PTXCONF_BLUEZ{_UTILS -> _TOOLS}* for consistency

[Roland Hieber]

"utils" is never used anywhere, neither in configure.ac, nor in our
kconfig menu. Rename it to prevent confusion.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 rules/bluez.in              | 2 +-
 rules/bluez.make            | 6 +++---
 scripts/migrate/migrate_ptx | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/rules/bluez.in b/rules/bluez.in
index e14135dd6..454798e53 100644
--- a/rules/bluez.in
+++ b/rules/bluez.in
@@ -23,7 +23,7 @@ config BLUEZ_SYSTEMD_UNIT
 	depends on SYSTEMD
 	prompt "install systemd unit files"
 
-config BLUEZ_UTILS
+config BLUEZ_TOOLS
 	bool "install bluez tools"
 	help
 	  install the tools "bccmd bluemoon btmon ciptool hciattach
diff --git a/rules/bluez.make b/rules/bluez.make
index b161d2730..c3a442381 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -43,8 +43,8 @@ BLUEZ_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--enable-threads \
 	--enable-library \
 	--$(call ptx/endis, PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS)-test \
-	--$(call ptx/endis, PTXCONF_BLUEZ_UTILS)-tools \
-	--$(call ptx/endis, PTXCONF_BLUEZ_UTILS)-monitor \
+	--$(call ptx/endis, PTXCONF_BLUEZ_TOOLS)-tools \
+	--$(call ptx/endis, PTXCONF_BLUEZ_TOOLS)-monitor \
 	--enable-udev \
 	--disable-cups \
 	--disable-obex \
@@ -81,7 +81,7 @@ $(STATEDIR)/bluez.targetinstall:
 	@$(call install_copy, bluez, 0, 0, 0755, -, /usr/libexec/bluetooth/obexd)
 	@$(call install_lib, bluez, 0, 0, 0644, libbluetooth)
 
-ifdef PTXCONF_BLUEZ_UTILS
+ifdef PTXCONF_BLUEZ_TOOLS
 	@$(foreach binprogram, bccmd bluemoon btmon ciptool \
 			hciattach hciconfig hcidump hcitool hex2hcd l2ping \
 			l2test mpris-proxy rctest rfcomm sdptool, \
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index fa5ec2348..33d3c281f 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -137,6 +137,14 @@ s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(ALSA_UTILS\|APACHE2\|AT\|CHRONY\
 #
 s/^\(\(# \)\?PTXCONF_BLUEZ\)_LIBS/\1/
 
+#
+# from   : ptxdist-2018.11.0
+# to     : ptxdist-2018.12.0
+# symbol : BLUEZ_UTILS*			-> BLUEZ_TOOLS*
+# reason : consolidation of config symbols
+#
+s/^\(\(# \)\?PTXCONF_BLUEZ\)_UTILS\(.*$\)/\1_TOOLS\2/
+
 #
 # from   : ptxdist-2011.01.0
 # to     : ptxdist-2011.02.0
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 5/5] bluez: version bump 5.30 -> 5.50

[Roland Hieber]

Update the list of configure options and their dependencies. Use default
values from the configure script for the various profiles; this enabled
OBEX by default.. Pin down the
GPL/LGPL license MD5 sums, and improve help texts.

Development packages can be built unconditionally. The conditional was
added because a previous version of the package installed the test
scripts directly from $(BLUEZ_DIR) during the targetinstall stage, but
this behaviour is no longer the case since PTXdist commit 17e02198ebf607
("bluez: version bump 4.96 -> 5.30").

Some tools are now deprecated, hide them behind an extra kconfig option.
Update the list of installed tools and testscripts in the targetinstall
stage to reflect the tools and scripts installed by the respective
configure options, and order them alphabetically. gatttool is no longer
installed by upstream, remove it.

Also use install_alternative instead of install_copy for all config
files and systemd units. Prevent a file name clash with the udev package
by only installing our rules.d/97-hid2hci.rules and hid2hci (used by the
udev rules), and not the whole /usr/lib/udev/ tree.

There are no patches in PTXdist which would need porting.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
v1 -> v2:
 - improve kconfig help texts, and add note about kernel support
 - build default profiles as ./configure does (incl. obex), and remove
   broken mesh profile option
 - tools: also install btattach
 - devpkg conditional is no longer needed
 - update list of tools and testscripts, ordered alphabetically
 - solve udev file naming conflict in targetinstall stage
---
 rules/bluez.in   | 33 ++++++++++++++++------
 rules/bluez.make | 73 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/rules/bluez.in b/rules/bluez.in
index 454798e53..57e0356af 100644
--- a/rules/bluez.in
+++ b/rules/bluez.in
@@ -8,12 +8,16 @@ menuconfig BLUEZ
 	select DBUS
 	select GLIB
 	select UDEV
+	select LIBICAL			# needed for --enable-obex
 	select READLINE			if BLUEZ_CLIENT
 	select PYGOBJECT		if BLUEZ_INSTALL_TESTSCRIPTS
 	select DBUS_PYTHON		if BLUEZ_INSTALL_TESTSCRIPTS
 	help
-	  Official Linux Bluetooth protocol stack
-	  For more information refer http://www.bluez.org
+	  Official Linux Bluetooth protocol stack.
+	  For more information refer to <http://www.bluez.org>.
+
+	  Note that you must also enable bluetooth and RFKILL support as well
+	  as the respective drivers in your kernel.
 
 if BLUEZ
 
@@ -24,20 +28,31 @@ config BLUEZ_SYSTEMD_UNIT
 	prompt "install systemd unit files"
 
 config BLUEZ_TOOLS
-	bool "install bluez tools"
+	bool "install tools"
+	help
+	  Install the following tools:
+	  
+	  bccmd bluemoon btmon btattach hex2hcd l2ping l2test mpris-proxy
+	  rctest l2ping rctest
+
+config BLUEZ_TOOLS_DEPRECATED
+	depends on BLUEZ_TOOLS
+	bool "install deprecated tools"
 	help
-	  install the tools "bccmd bluemoon btmon ciptool hciattach
-	  hciconfig hcidump hcitool hex2hcd l2ping l2test mpris-proxy rctest
-	  rfcomm sdptoolciptool l2ping hcitool rctest rfcomm" and "sdptool"
+	  Install the following tools, which have been deprecated by upstream:
+	  
+	  bccmd bluemoon btattach btmon hex2hcd l2ping l2test mpris-proxy
+	  rctest
 
 config BLUEZ_CLIENT
-	bool "install client tools: bluetoothctl, gatttool"
+	bool "install client tools"
 	help
-	  install the client tools bluetoothctl and gatttool
+	  Install the bluetoothctl command line tool
 
 config BLUEZ_INSTALL_TESTSCRIPTS
 	bool "install testscripts"
 	help
-	  install test scripts that allow to set up bluetooth connections
+	  Install test scripts that allow to set up bluetooth connections.
+	  These scripts are installed to /usr/lib/bluez/test/.
 
 endif
diff --git a/rules/bluez.make b/rules/bluez.make
index c3a442381..f5c1191ad 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -1,6 +1,8 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2010 by Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
+# Copyright (C) 2018 Pengutronix, Roland Hieber <r.hieber@pengutronix.de>
+#
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,17 +18,17 @@ PACKAGES-$(PTXCONF_BLUEZ) += bluez
 #
 # Paths and names
 #
-BLUEZ_VERSION	:= 5.30
-BLUEZ_MD5	:= a7b99d40cd78c7497abdfd7f024fd07b
+BLUEZ_VERSION	:= 5.50
+BLUEZ_MD5	:= 860349d2afebf130f772c0f2943b5a27
 BLUEZ		:= bluez-$(BLUEZ_VERSION)
 BLUEZ_SUFFIX	:= tar.gz
 BLUEZ_URL	:= $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX))
 BLUEZ_SOURCE	:= $(SRCDIR)/$(BLUEZ).$(BLUEZ_SUFFIX)
 BLUEZ_DIR	:= $(BUILDDIR)/$(BLUEZ)
 BLUEZ_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
-ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
-BLUEZ_DEVPKG	:= NO
-endif
+BLUEZ_LICENSE_FILES := \
+	  file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
+	  file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -41,20 +43,34 @@ BLUEZ_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-debug \
 	--disable-pie \
 	--enable-threads \
+	--disable-backtrace \
 	--enable-library \
 	--$(call ptx/endis, PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS)-test \
+	--disable-nfc \
+	--disable-sap \
+	--enable-a2dp \
+	--enable-avrcp \
+	--enable-network \
+	--enable-hid \
+	--enable-hog \
+	--disable-health \
 	--$(call ptx/endis, PTXCONF_BLUEZ_TOOLS)-tools \
 	--$(call ptx/endis, PTXCONF_BLUEZ_TOOLS)-monitor \
 	--enable-udev \
 	--disable-cups \
-	--disable-obex \
+	--disable-mesh \
+	--disable-midi \
+	--enable-obex \
+	--disable-btpclient \
 	--$(call ptx/endis, PTXCONF_BLUEZ_CLIENT)-client \
 	--enable-systemd \
 	--enable-datafiles \
 	--disable-manpages \
 	--disable-experimental \
+	--$(call ptx/endis, PTXCONF_BLUEZ_TOOLS_DEPRECATED)-deprecated \
 	--disable-sixaxis \
 	--disable-android \
+	--disable-logger \
 	--with-dbusconfdir=/usr/share \
 	--with-dbussystembusdir=/usr/share/dbus-1/system-services \
 	--with-dbussessionbusdir=/usr/share/dbus-1/services \
@@ -82,34 +98,37 @@ $(STATEDIR)/bluez.targetinstall:
 	@$(call install_lib, bluez, 0, 0, 0644, libbluetooth)
 
 ifdef PTXCONF_BLUEZ_TOOLS
-	@$(foreach binprogram, bccmd bluemoon btmon ciptool \
-			hciattach hciconfig hcidump hcitool hex2hcd l2ping \
-			l2test mpris-proxy rctest rfcomm sdptool, \
+	@$(foreach binprogram, bccmd bluemoon btattach btmon hex2hcd l2ping \
+			l2test mpris-proxy rctest, \
+		$(call install_copy, bluez, 0, 0, 0755, -, \
+			/usr/bin/$(binprogram));)
+
+ifdef PTXCONF_BLUEZ_TOOLS_DEPRECATED
+	@$(foreach binprogram, ciptool hciattach hciconfig hcidump hcitool \
+			rfcomm sdptool, \
 		$(call install_copy, bluez, 0, 0, 0755, -, \
 			/usr/bin/$(binprogram))$(ptx/nl))
 endif
+endif
 
 ifdef PTXCONF_BLUEZ_CLIENT
 	@$(call install_copy, bluez, 0, 0, 0755, -, /usr/bin/bluetoothctl)
-
-	@$(call install_copy, bluez, 0, 0, 0755, $(BLUEZ_DIR)/attrib/gatttool, \
-		/usr/bin/gatttool)
 endif
 
 ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
-	@$(foreach testdata, service-ftp.xml service-did.xml service-spp.xml \
-			service-record.dtd service-opp.xml, \
+	@$(foreach testdata, service-did.xml service-ftp.xml service-opp.xml \
+			service-record.dtd service-spp.xml, \
 		$(call install_copy, bluez, 0, 0, 0644, -, \
 			/usr/lib/bluez/test/$(testdata))$(ptx/nl))
 
-	@$(foreach testprog, list-devices opp-client \
-			simple-endpoint test-alert test-discovery \
-			test-heartrate test-nap test-proximity \
-			map-client pbap-client simple-player test-cyclingspeed \
-			test-health test-hfp test-network test-sap-server \
-			ftp-client monitor-bluetooth simple-agent \
-			test-adapter test-device test-health-sink test-manager \
-			test-profile test-thermometer, \
+	@$(foreach testprog, bluezutils.py dbusdef.py example-advertisement \
+			example-gatt-client example-gatt-server ftp-client \
+			list-devices map-client monitor-bluetooth opp-client \
+			pbap-client sap_client.py simple-agent simple-endpoint \
+			simple-player test-adapter test-device test-discovery \
+			test-gatt-profile test-health test-health-sink test-hfp \
+			test-manager test-nap test-network test-profile \
+			test-sap-server, \
 		$(call install_copy, bluez, 0, 0, 0755, -, \
 			/usr/lib/bluez/test/$(testprog))$(ptx/nl))
 	@$(foreach testprog, bluezutils.py dbusdef.py sap_client.py, \
@@ -117,16 +136,18 @@ ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
 			/usr/lib/bluez/test/$(testprog))$(ptx/nl))
 endif
 
-	@$(call install_copy, bluez, 0, 0, 0644, -, \
+	@$(call install_alternative, bluez, 0, 0, 0644, \
 		/usr/share/dbus-1/system.d/bluetooth.conf)
-	@$(call install_tree, bluez, 0, 0, -, /usr/lib/udev/rules.d/)
+	@$(call install_alternative, bluez, 0, 0, 0644, \
+		/usr/lib/udev/rules.d/97-hid2hci.rules)
+	@$(call install_copy, bluez, 0, 0, 0644, -, /usr/lib/udev/hid2hci)
 
 ifdef PTXCONF_BLUEZ_SYSTEMD_UNIT
-	@$(call install_copy, bluez, 0, 0, 0644, -, \
+	@$(call install_alternative, bluez, 0, 0, 0644, \
 		/usr/lib/systemd/system/bluetooth.service)
 	@$(call install_link, bluez, ../bluetooth.service, \
 		/usr/lib/systemd/system/multi-user.target.wants/bluetooth.service)
-	@$(call install_copy, bluez, 0, 0, 0644, -, \
+	@$(call install_alternative, bluez, 0, 0, 0644, \
 		/usr/lib/systemd/user/obex.service)
 endif
 
-- 
2.19.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de