[bluez] version bump 3.36 -> 4.69next/bluez

upstream merged bluez-lib and bluez-utils, so did I.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
[mkl: fix gstreamer deps, install gst plugins in targetinstall]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

8 files changed, 180 insertions, 165 deletions

diff --git a/rules/bluez-libs.in b/rules/bluez-libs.in
deleted file mode 100644
index b3b88e98b..000000000
--- a/rules/bluez-libs.in
+++ /dev/null
@@ -1,11 +0,0 @@
-## SECTION=communication
-
-config BLUEZ_LIBS
-	tristate
-	prompt "bluez-libs"
-	help
-	  bluez libraries, needed to build bluez-utils. For details
-	  about this project see the homepage on
-
-		http://www.bluez.org
-
diff --git a/rules/bluez-libs.make b/rules/bluez-libs.make
deleted file mode 100644
index 4da299e9f..000000000
--- a/rules/bluez-libs.make
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2005 by Robert Schwebel
-#               2007, 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLUEZ_LIBS) += bluez-libs
-
-#
-# Paths and names
-#
-BLUEZ_LIBS_VERSION	:= 3.36
-BLUEZ_LIBS		:= bluez-libs-$(BLUEZ_LIBS_VERSION)
-BLUEZ_LIBS_SUFFIX	:= tar.gz
-BLUEZ_LIBS_URL		:= http://bluez.sourceforge.net/download/$(BLUEZ_LIBS).$(BLUEZ_LIBS_SUFFIX)
-BLUEZ_LIBS_SOURCE	:= $(SRCDIR)/$(BLUEZ_LIBS).$(BLUEZ_LIBS_SUFFIX)
-BLUEZ_LIBS_DIR		:= $(BUILDDIR)/$(BLUEZ_LIBS)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(BLUEZ_LIBS_SOURCE):
-	@$(call targetinfo)
-	@$(call get, BLUEZ_LIBS)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-BLUEZ_LIBS_PATH	:= PATH=$(CROSS_PATH)
-BLUEZ_LIBS_ENV 	:= $(CROSS_ENV)
-
-#
-# autoconf
-#
-BLUEZ_LIBS_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/bluez-libs.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, bluez-libs)
-	@$(call install_fixup, bluez-libs,PRIORITY,optional)
-	@$(call install_fixup, bluez-libs,SECTION,base)
-	@$(call install_fixup, bluez-libs,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, bluez-libs,DESCRIPTION,missing)
-
-	@$(call install_copy, bluez-libs, 0, 0, 0644, - ,\
-		/usr/lib/libbluetooth.so.2.11.2)
-	@$(call install_link, bluez-libs, libbluetooth.so.2.11.2, /usr/lib/libbluetooth.so.2)
-	@$(call install_link, bluez-libs, libbluetooth.so.2.11.2, /usr/lib/libbluetooth.so)
-
-	@$(call install_finish, bluez-libs)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/rules/bluez-utils.in b/rules/bluez-utils.in
deleted file mode 100644
index 27ba1d6c0..000000000
--- a/rules/bluez-utils.in
+++ /dev/null
@@ -1,12 +0,0 @@
-## SECTION=communication
-
-config BLUEZ_UTILS
-	tristate
-	prompt "bluez-utils"
-	select BLUEZ_LIBS
-	select DBUS
-	help
-	  For details about this project see the homepage on
-
-		http://www.bluez.org
-
diff --git a/rules/bluez-utils.make b/rules/bluez-utils.make
deleted file mode 100644
index 9a7f30bd1..000000000
--- a/rules/bluez-utils.make
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2005 by Robert Schwebel
-#               2007 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLUEZ_UTILS) += bluez-utils
-
-#
-# Paths and names
-#
-BLUEZ_UTILS_VERSION	:= 3.36
-BLUEZ_UTILS		:= bluez-utils-$(BLUEZ_UTILS_VERSION)
-BLUEZ_UTILS_SUFFIX	:= tar.gz
-BLUEZ_UTILS_URL		:= http://bluez.sourceforge.net/download/$(BLUEZ_UTILS).$(BLUEZ_UTILS_SUFFIX)
-BLUEZ_UTILS_SOURCE	:= $(SRCDIR)/$(BLUEZ_UTILS).$(BLUEZ_UTILS_SUFFIX)
-BLUEZ_UTILS_DIR		:= $(BUILDDIR)/$(BLUEZ_UTILS)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(BLUEZ_UTILS_SOURCE):
-	@$(call targetinfo)
-	@$(call get, BLUEZ_UTILS)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-BLUEZ_UTILS_PATH	:= PATH=$(CROSS_PATH)
-BLUEZ_UTILS_ENV 	:= $(CROSS_ENV)
-
-#
-# autoconf
-#
-BLUEZ_UTILS_AUTOCONF := \
-	$(CROSS_AUTOCONF_USR) \
-	--without-alsa \
-	--without-fuse \
-	--without-openobex \
-	--without-usb
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/bluez-utils.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, bluez-utils)
-	@$(call install_fixup, bluez-utils,PRIORITY,optional)
-	@$(call install_fixup, bluez-utils,SECTION,base)
-	@$(call install_fixup, bluez-utils,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, bluez-utils,DESCRIPTION,missing)
-
-	# FIXME: wait for patch from Sandro Noel
-#	@$(call install_copy, bluez-utils, 0, 0, 0755, $(BLUEZ_UTILS_DIR)/foobar, /dev/null)
-
-	@$(call install_finish, bluez-utils)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/rules/bluez.in b/rules/bluez.in
new file mode 100644
index 000000000..b0265ebef
--- /dev/null
+++ b/rules/bluez.in
@@ -0,0 +1,36 @@
+## SECTION=communication
+
+menuconfig BLUEZ
+	tristate "bluez                         "
+	select DBUS
+	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
+	help
+	  official Linux Bluetooth protocol stack
+
+if BLUEZ
+
+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
+
+config BLUEZ_INSTALL_TESTSCRIPTS
+	bool "install testscripts"
+	help
+	  install test scripts that allow to set up bluetooth connections
+
+endif
diff --git a/rules/bluez.make b/rules/bluez.make
new file mode 100644
index 000000000..d72a05470
--- /dev/null
+++ b/rules/bluez.make
@@ -0,0 +1,137 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_BLUEZ) += bluez
+
+#
+# Paths and names
+#
+BLUEZ_VERSION	:= 4.69
+BLUEZ		:= bluez-$(BLUEZ_VERSION)
+BLUEZ_SUFFIX	:= tar.gz
+BLUEZ_URL	:= http://www.kernel.org/pub/linux/bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX)
+BLUEZ_SOURCE	:= $(SRCDIR)/$(BLUEZ).$(BLUEZ_SUFFIX)
+BLUEZ_DIR	:= $(BUILDDIR)/$(BLUEZ)
+BLUEZ_LICENSE	:= GPLv2+ LGPLv2.1+
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+BLUEZ_CONF_TOOL	:= autoconf
+BLUEZ_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
+	--localstatedir=/var \
+	--enable-audio \
+	--enable-bccmd \
+	--disable-capng \
+	--enable-configfiles \
+	--disable-cups \
+	--enable-debug \
+	--disable-dfutool \
+	--disable-dund \
+	--disable-fortify \
+	--disable-hid2hci \
+	--disable-hidd \
+	--enable-input \
+	--enable-libtool-lock \
+	--disable-maemo6 \
+	--disable-netlink \
+	--enable-network \
+	--enable-optimization \
+	--disable-pand \
+	--disable-pcmcia \
+	--disable-pie \
+	--disable-pnat \
+	--enable-serial \
+	--enable-service \
+	--enable-shared \
+	--disable-static \
+	--enable-test \
+	--disable-tracer \
+	--enable-tools \
+	--enable-udevrules \
+	--enable-usb
+
+ifdef PTXCONF_BLUEZ_ALSA
+BLUEZ_CONF_OPT += --enable-alsa
+else
+BLUEZ_CONF_OPT += --disable-alsa
+endif
+
+ifdef PTXCONF_BLUEZ_GSTREAMER
+BLUEZ_CONF_OPT += --enable-gstreamer
+else
+BLUEZ_CONF_OPT += --disable-gstreamer
+endif
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/bluez.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init,  bluez)
+	@$(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)
+
+	@$(foreach lib,libbluetooth.so.3.9.0, \
+	$(call install_copy, bluez, 0, 0, 0644, -, /usr/lib/$(lib)); \
+	$(call install_link, bluez, $(lib), /usr/lib/$(basename $(lib))); \
+	$(call install_link, bluez, $(lib), /usr/lib/$(basename $(basename $(lib)))); \
+	)
+
+ifdef PTXCONF_BLUEZ_ALSA
+	@$(foreach alsamod,ctl_bluetooth pcm_bluetooth, \
+	$(call install_copy, bluez, 0, 0, 0644, -, /usr/lib/alsa-lib/libasound_module_$(alsamod).so); \
+	)
+endif
+
+ifdef PTXCONF_BLUEZ_GSTREAMER
+	@$(call install_copy, bluez, 0, 0, 0644, -, /usr/lib/gstreamer-0.10/libgstbluetooth.so)
+endif
+
+ifdef PTXCONF_BLUEZ_UTILS
+	@$(foreach binprogram,ciptool l2ping hcitool 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_alternative, bluez, 0, 0, 0755, /test/$(testprog), n, /usr/share/doc/bluez/examples/$(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)
+	@$(foreach udevrule, $(notdir $(wildcard $(BLUEZ_PKGDIR)/lib/udev/rules.d/*.rules)), \
+	$(call install_copy, bluez, 0, 0, 0644, -, /lib/udev/rules.d/$(udevrule)); \
+	)
+
+	@$(call install_finish, bluez)
+	@$(call touch)
+
+# vim: syntax=make
diff --git a/rules/libpcap.in b/rules/libpcap.in
index 87027bb03..a6529683a 100644
--- a/rules/libpcap.in
+++ b/rules/libpcap.in
@@ -3,7 +3,7 @@
 menuconfig LIBPCAP
 	tristate
 	prompt "libpcap                       "
-	select BLUEZ_LIBS	if LIBPCAP_BLUETOOTH
+	select BLUEZ	if LIBPCAP_BLUETOOTH
 	help
 	  libpcap is a system-independent interface for user-level packet capture.
 	  libpcap provides a portable framework for low-level network monitoring.
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 4ed9fd814..7296ec2ee 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -130,3 +130,9 @@ s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_TELNETD\(.*\)$/\1UTELNETD_BBINIT_L
 s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(CROND\|HWCLOCK\|TELNETD\)/\1BUSYBOX_\3_BBINIT_LINK/
 s/^\(\(# \)\?PTXCONF_\)INITMETHOD_BBINIT_LINK_\(ALSA_UTILS\|APACHE2\|AT\|CHRONY\|CONNMAN\|CVS\|DBUS\|DIBBLER_[A-Z]*\|DNSMASQ\|DROPBEAR\|FAKE_OVERLAYFS\|LIGHTTPD\|LVM2\|MYSQL\|NTPCLIENT\|OPENSSH\|PORTMAP\|PPPD\|PROFTPD\|PUREFTPD\|RC_ONCE\|SAMBA\|SPLASHUTILS\|THTTPD\|UDEV\)/\1\3_BBINIT_LINK/
 
+#
+# symbol : PTXCONF_BLUEZ_LIBS -> PTXCONF_BLUEZ
+# reason : upstream merged bluez-libs + bluez-utils -> bluez
+#          PTXCONF_BLUEZ_UTILS is unchanged
+#
+s/^\(\(# \)\?PTXCONF_BLUEZ\)_LIBS/\1/