aboutsummaryrefslogtreecommitdiff
path: root/package/bluez-tools
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2020-01-12 23:08:39 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-02-03 22:55:08 +0100
commit61a813339af43024ec05e749a05886fff1bf2a39 (patch)
tree06958de147a041d1095fd6ec66db04e0556d318c /package/bluez-tools
parent9228c061d5cfd11dfde9b240b7cc6653437f4e2d (diff)
downloadbuildroot-61a813339af43024ec05e749a05886fff1bf2a39.tar.gz
buildroot-61a813339af43024ec05e749a05886fff1bf2a39.tar.bz2
package/bluez_utils: drop package
BlueZ 4.x is deprecated since a long time (BlueZ 5.x has been released in 2012) so drop it. For cwiid, sconeserver and ussp-push, replace bluez_utils by bluez5_utils. All other packages already support bluez5_utils so just drop bluez_utils. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/bluez-tools')
-rw-r--r--package/bluez-tools/Config.in4
-rw-r--r--package/bluez-tools/bluez-tools.hash1
-rw-r--r--package/bluez-tools/bluez-tools.mk22
3 files changed, 3 insertions, 24 deletions
diff --git a/package/bluez-tools/Config.in b/package/bluez-tools/Config.in
index 5a1b7d0412..6db874b23a 100644
--- a/package/bluez-tools/Config.in
+++ b/package/bluez-tools/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_BLUEZ_TOOLS
bool "bluez-tools"
- depends on BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
+ depends on BR2_PACKAGE_BLUEZ5_UTILS
depends on BR2_USE_MMU # dbus, libglib2
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
@@ -14,6 +14,6 @@ config BR2_PACKAGE_BLUEZ_TOOLS
https://github.com/khvzak/bluez-tools
comment "bluez-tools needs a toolchain w/ wchar, threads"
- depends on BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
+ depends on BR2_PACKAGE_BLUEZ5_UTILS
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/bluez-tools/bluez-tools.hash b/package/bluez-tools/bluez-tools.hash
index 8be058ea6a..808e5c6061 100644
--- a/package/bluez-tools/bluez-tools.hash
+++ b/package/bluez-tools/bluez-tools.hash
@@ -1,4 +1,3 @@
# Locally computed
-sha256 56204ddd1cc7890d60f6a47507755f786fa3ee28f1da370a32ca7d7e0795a953 bluez-tools-171181b6ef6c94aefc828dc7fd8de136b9f97532.tar.gz
sha256 62ca98af63d2ae142dbc77995c6bd4c259eaba4a5832daa33ae9e3d585b9205f bluez-tools-97efd293491ad7ec96a655665339908f2478b3d1.tar.gz
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
diff --git a/package/bluez-tools/bluez-tools.mk b/package/bluez-tools/bluez-tools.mk
index 49891bd2d1..c58701981a 100644
--- a/package/bluez-tools/bluez-tools.mk
+++ b/package/bluez-tools/bluez-tools.mk
@@ -4,33 +4,13 @@
#
################################################################################
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
-# this is the last version compatible with BlueZ 4 API
-BLUEZ_TOOLS_VERSION = 171181b6ef6c94aefc828dc7fd8de136b9f97532
-else
BLUEZ_TOOLS_VERSION = 97efd293491ad7ec96a655665339908f2478b3d1
-endif
BLUEZ_TOOLS_SITE = $(call github,khvzak,bluez-tools,$(BLUEZ_TOOLS_VERSION))
# sources fetched from github, no configure script)
BLUEZ_TOOLS_AUTORECONF = YES
-BLUEZ_TOOLS_DEPENDENCIES = host-pkgconf dbus dbus-glib
+BLUEZ_TOOLS_DEPENDENCIES = host-pkgconf dbus dbus-glib bluez5_utils readline
BLUEZ_TOOLS_LICENSE = GPL-2.0+
BLUEZ_TOOLS_LICENSE_FILES = COPYING
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
-BLUEZ_TOOLS_DEPENDENCIES += bluez_utils
-# readline is an optional dependency when used with bluez_utils
-# obex support depends on readline so enable it optionally
-ifeq ($(BR2_PACKAGE_READLINE),y)
-BLUEZ_TOOLS_CONF_OPTS += --enable-obex
-BLUEZ_TOOLS_DEPENDENCIES += readline
-else
-BLUEZ_TOOLS_CONF_OPTS += --disable-obex
-endif
-else
-# readline is a hard dependency when used with bluez5_utils
-BLUEZ_TOOLS_DEPENDENCIES += bluez5_utils readline
-endif
-
$(eval $(autotools-package))