From: Juergen Borleis <jbe@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] bluez: version bump 4.96 -> 5.28
Date: Thu, 26 Feb 2015 11:30:23 +0100 [thread overview]
Message-ID: <1424946623-28480-2-git-send-email-jbe@pengutronix.de> (raw)
In-Reply-To: <1424946623-28480-1-git-send-email-jbe@pengutronix.de>
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
rules/bluez.in | 39 +++++++-------------
rules/bluez.make | 106 +++++++++++++++++++++++--------------------------------
2 files changed, 58 insertions(+), 87 deletions(-)
diff --git a/rules/bluez.in b/rules/bluez.in
index cf489a4..fc2601e 100644
--- a/rules/bluez.in
+++ b/rules/bluez.in
@@ -2,16 +2,18 @@
menuconfig BLUEZ
tristate "bluez "
+ select LIBC_DL
+ select LIBC_PTHREAD
+ select LIBC_RT
select DBUS
select GLIB
- select LIBUSB_COMPAT if BLUEZ_USB
- select ALSA_LIB if BLUEZ_ALSA
- select GSTREAMER if BLUEZ_GSTREAMER
- select GST_PLUGINS_BASE if BLUEZ_GSTREAMER
- select PYGOBJECT if BLUEZ_INSTALL_TESTSCRIPTS
- select DBUS_PYTHON if BLUEZ_INSTALL_TESTSCRIPTS
+ select UDEV
+ select READLINE
+ select PYGOBJECT if BLUEZ_INSTALL_TESTSCRIPTS
+ select DBUS_PYTHON if BLUEZ_INSTALL_TESTSCRIPTS
help
- official Linux Bluetooth protocol stack
+ Official Linux Bluetooth protocol stack
+ For more information refer http://www.bluez.org
if BLUEZ
@@ -19,29 +21,14 @@ config BLUEZ_SYSTEMD_UNIT
bool
default y
depends on SYSTEMD
- prompt "install systemd unit files for bluez"
+ prompt "install systemd unit files"
-config BLUEZ_USB
- bool "USB support"
- default y
- help
- Build bluez with USB support. Only disable this if your Bluetooth
- adapter is not connected via USB (for example with an UART or SDIO).
-
-config BLUEZ_ALSA
- bool "alsa support"
- help
- install bluez-alsa modules
-
-config BLUEZ_GSTREAMER
- bool "gstreamer support"
- help
- install libgstbluetooth
-
config BLUEZ_UTILS
bool "install bluez tools"
help
- install ciptool l2ping hcitool rctest rfcomm sdptool
+ install the tools "bccmd bluemoon bluetoothctl btmon ciptool hciattach
+ hciconfig hcidump hcitool hex2hcd l2ping l2test mpris-proxy rctest
+ rfcomm sdptoolciptool l2ping hcitool rctest rfcomm" and "sdptool"
config BLUEZ_INSTALL_TESTSCRIPTS
bool "install testscripts"
diff --git a/rules/bluez.make b/rules/bluez.make
index b46bece..7f5be73 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BLUEZ) += bluez
#
# Paths and names
#
-BLUEZ_VERSION := 4.96
-BLUEZ_MD5 := 1d363ed751f89133f953182e843b2a19 296111afac49e3f9035085ac14daf518
+BLUEZ_VERSION := 5.28
+BLUEZ_MD5 := b2532e89a7c829b62ca25f041b3df3cd
BLUEZ := bluez-$(BLUEZ_VERSION)
BLUEZ_SUFFIX := tar.gz
BLUEZ_URL := $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX))
@@ -28,9 +28,6 @@ ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
BLUEZ_DEVPKG := NO
endif
-# the tools don't depend on the generated headers
-BLUEZ_MAKE_PAR := NO
-
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
@@ -41,41 +38,29 @@ BLUEZ_MAKE_PAR := NO
BLUEZ_CONF_TOOL := autoconf
BLUEZ_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--enable-optimization \
- --disable-fortify \
+ --disable-debug \
--disable-pie \
- --enable-network \
- --disable-sap \
- --disable-proximity \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-service \
- --disable-health \
- --disable-pnat \
- --disable-gatt-example \
- --$(call ptx/endis, PTXCONF_BLUEZ_GSTREAMER)-gstreamer \
- --$(call ptx/endis, PTXCONF_BLUEZ_ALSA)-alsa \
- --$(call ptx/endis, PTXCONF_BLUEZ_USB)-usb \
- --disable-tracer \
+ --enable-threads \
+ --enable-library \
+ --$(call ptx/endis, PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS)-test \
--enable-tools \
- --enable-bccmd \
- --disable-pcmcia \
- --disable-hid2hci \
- --disable-dfutool \
- --disable-hidd \
- --disable-pand \
- --disable-dund \
+ --enable-monitor \
+ --enable-udev \
--disable-cups \
- --enable-test \
+ --disable-obex \
+ --enable-client \
+ --enable-systemd \
--enable-datafiles \
- --enable-debug \
- --disable-maemo6 \
- --disable-dbusoob \
- --disable-wiimote \
- --disable-hal \
- --disable-thermometer \
- --disable-capng \
- --with-systemdunitdir=/lib/systemd/system
+ --disable-manpages \
+ --disable-experimental \
+ --disable-sixaxis \
+ --disable-android \
+ --with-dbusconfdir=/etc \
+ --with-dbussystembusdir=/usr/share/dbus-1/system-services \
+ --with-dbussessionbusdir=/usr/share/dbus-1/services \
+ --with-udevdir=/lib/udev \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --with-systemduserunitdir=/usr/lib/systemd/user
# ----------------------------------------------------------------------------
# Target-Install
@@ -88,43 +73,40 @@ $(STATEDIR)/bluez.targetinstall:
@$(call install_fixup, bluez,PRIORITY,optional)
@$(call install_fixup, bluez,SECTION,base)
@$(call install_fixup, bluez,AUTHOR,"Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>")
- @$(call install_fixup, bluez,DESCRIPTION,missing)
+ @$(call install_fixup, bluez,DESCRIPTION, "Bluetooth protocol stack")
@$(call install_lib, bluez, 0, 0, 0644, libbluetooth)
-ifdef PTXCONF_BLUEZ_ALSA
- @$(foreach alsamod, ctl_bluetooth pcm_bluetooth, \
- $(call install_lib, bluez, 0, 0, 0644, \
- alsa-lib/libasound_module_$(alsamod));)
-endif
-
-ifdef PTXCONF_BLUEZ_GSTREAMER
- @$(call install_lib, bluez, 0, 0, 0644, gstreamer-0.10/libgstbluetooth)
-endif
+ @$(call install_copy, bluez, 0, 0, 0755, -, /usr/libexec/bluetooth/bluetoothd)
+ @$(call install_copy, bluez, 0, 0, 0755, -, /usr/libexec/bluetooth/obexd)
+ @$(call install_lib, bluez, 0, 0, 0644, libbluetooth)
ifdef PTXCONF_BLUEZ_UTILS
- @$(foreach binprogram, ciptool l2ping hcitool rctest rfcomm sdptool, \
+ @$(foreach binprogram, bccmd bluemoon bluetoothctl btmon ciptool \
+ hciattach hciconfig hcidump hcitool hex2hcd l2ping \
+ l2test mpris-proxy rctest rfcomm sdptool, \
$(call install_copy, bluez, 0, 0, 0755, -, \
/usr/bin/$(binprogram));)
-
- @$(foreach sbinprogram, bccmd hciattach hciconfig, \
- $(call install_copy, bluez, 0, 0, 0755, -, \
- /usr/sbin/$(sbinprogram));)
endif
ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
- @$(foreach testprog, simple-agent simple-service test-telephony \
- test-adapter test-audio test-device test-discovery \
- test-input test-manager test-network test-serial \
- test-service test-telephony test-textfile \
- monitor-bluetooth, \
- $(call install_copy, bluez, 0, 0, 0755, \
- $(BLUEZ_DIR)/test/$(testprog), \
- /usr/share/doc/bluez/examples/$(testprog));)
+ @$(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));)
+
+ @$(foreach testprog, bluezutils.py list-devices opp-client \
+ simple-endpoint test-alert test-discovery \
+ test-heartrate test-nap test-proximity dbusdef.py \
+ map-client pbap-client simple-player test-cyclingspeed \
+ test-health test-hfp test-network test-sap-server \
+ ftp-client monitor-bluetooth sap_client.py simple-agent \
+ test-adapter test-device test-health-sink test-manager \
+ test-profile test-thermometer, \
+ $(call install_copy, bluez, 0, 0, 0755, -, \
+ /usr/lib/bluez/test/$(testprog));)
endif
- @$(call install_copy, bluez, 0, 0, 0755, -, /usr/sbin/bluetoothd)
-
@$(call install_copy, bluez, 0, 0, 0644, -, \
/etc/dbus-1/system.d/bluetooth.conf)
@$(call install_tree, bluez, 0, 0, -, /lib/udev/rules.d/)
@@ -134,6 +116,8 @@ ifdef PTXCONF_BLUEZ_SYSTEMD_UNIT
/lib/systemd/system/bluetooth.service)
@$(call install_link, bluez, ../bluetooth.service, \
/lib/systemd/system/multi-user.target.wants/bluetooth.service)
+ @$(call install_copy, bluez, 0, 0, 0644, -, \
+ /usr/lib/systemd/user/obex.service)
endif
@$(call install_finish, bluez)
--
2.1.4
--
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2015-02-26 10:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-26 10:30 [ptxdist] bluez: package update Juergen Borleis
2015-02-26 10:30 ` Juergen Borleis [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424946623-28480-2-git-send-email-jbe@pengutronix.de \
--to=jbe@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox