"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.hie...@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
