fix some bluetooth packaging bugs

6 files changed, 94 insertions, 8 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index fb69470aa..6d3dccfce 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1036,9 +1036,9 @@ $(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIBCM203X,bluetooth-hci-bcm203x
 	$(MODULES_DIR)/kernel/drivers/bluetooth/bcm203x \
 ,75))
 
-$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIUSB,bluetooth-hci-usb,\
-	$(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb \
-,75))
+$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIBTUSB,bluetooth-hci-usb,\
+	$(MODULES_DIR)/kernel/drivers/bluetooth/btusb \
+,76))
 
 $(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIUART,bluetooth-hci-uart,\
 	$(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart \
diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index 2652c0a94..c84bb0625 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		1cc3cefad872e937e05de5a0a2b390dd
 PKG_DESCR:=		Bluez firmware for BCM2033
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bluetooth bluez-libs bluez-utils
+PKG_DEPENDS:=		kmod-bluetooth bluez
 PKG_URL:=		http://www.bluez.org
 PKG_SITES:=		http://bluez.sourceforge.net/download/
 
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 667ccc56e..8ba8f00ca 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
 PKG_VERSION:=		4.57
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		dc29e54f1204ac4215caeeee062b26f6
 PKG_DESCR:=		bluetooth libraries and applications
 PKG_SECTION:=		bluetooth
@@ -31,6 +31,8 @@ CONFIGURE_ARGS+=	--enable-tools \
 			--enable-hidd \
 			--enable-pand \
 			--enable-dund \
+			--enable-netlink \
+			--disable-pie \
 			--disable-cups
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
@@ -46,9 +48,9 @@ endif
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_BLUEZ}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_BLUEZ}/etc/bluetooth
-	${CP} ${WRKINST}/etc/bluetooth/rfcomm.conf \
-	    ${IDIR_BLUEZ}/etc/bluetooth/
-	$(INSTALL_DATA) $(WRKINST)/etc/dbus-1/system.d/bluetooth.conf \
+	$(INSTALL_DATA) ./files/main.conf \
+		${IDIR_BLUEZ}/etc/bluetooth/
+	$(INSTALL_DATA) ./files/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bluez/files/bluetooth.conf b/package/bluez/files/bluetooth.conf
new file mode 100644
index 000000000..796354692
--- /dev/null
+++ b/package/bluez/files/bluetooth.conf
@@ -0,0 +1,31 @@
+<!-- This configuration file specifies the required security policies
+     for Bluetooth core daemon to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+  <policy user="root">
+    <allow own="org.bluez"/>
+    <allow send_destination="org.bluez"/>
+    <allow send_interface="org.bluez.Agent"/>
+  </policy>
+
+  <policy at_console="true">
+    <allow send_destination="org.bluez"/>
+  </policy>
+
+  <!-- allow users of lp group (printing subsystem) to 
+       communicate with bluetoothd
+  <policy group="lp">
+    <allow send_destination="org.bluez"/>
+  </policy>
+  -->
+
+  <policy context="default">
+    <deny send_destination="org.bluez"/>
+  </policy>
+
+</busconfig>
diff --git a/package/bluez/files/main.conf b/package/bluez/files/main.conf
new file mode 100644
index 000000000..bf3d9f3d3
--- /dev/null
+++ b/package/bluez/files/main.conf
@@ -0,0 +1,52 @@
+[General]
+
+# List of plugins that should not be loaded on bluetoothd startup
+DisablePlugins = network,input,audio
+
+# Default adaper name
+# %h - substituted for hostname
+# %d - substituted for adapter id
+Name = %h-%d
+
+# Default device class. Only the major and minor device class bits are
+# considered.
+Class = 0x000100
+
+# How long to stay in discoverable mode before going back to non-discoverable
+# The value is in seconds. Default is 180, i.e. 3 minutes.
+# 0 = disable timer, i.e. stay discoverable forever
+DiscoverableTimeout = 0
+
+# How long to stay in pairable mode before going back to non-discoverable
+# The value is in seconds. Default is 0.
+# 0 = disable timer, i.e. stay pairable forever
+PairableTimeout = 0
+
+# Use some other page timeout than the controller default one
+# which is 16384 (10 seconds).
+PageTimeout = 8192
+
+# Discover scheduler interval used in Adapter.DiscoverDevices
+# The value is in seconds. Defaults is 0 to use controller scheduler.
+DiscoverSchedulerInterval = 0
+
+# What value should be assumed for the adapter Powered property when
+# SetProperty(Powered, ...) hasn't been called yet. Defaults to true
+InitiallyPowered = true
+
+# Remember the previously stored Powered state when initializing adapters
+RememberPowered = true
+
+# Use vendor, product and version information for DID profile support.
+# The values are separated by ":" and VID, PID and version.
+#DeviceID = 1234:5678:abcd
+
+# Do reverse service discovery for previously unknown devices that connect to
+# us. This option is really only needed for qualification since the BITE tester
+# doesn't like us doing reverse SDP for some test cases (though there could in
+# theory be other useful purposes for this too). Defaults to true.
+ReverseServiceDiscovery = true
+
+# Enable name resolving after inquiry. Set it to 'false' if you don't need
+# remote devices name and want shorter discovery cycle. Defaults to 'true'.
+NameResolving = true
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 800ec9829..a5eeb10cb 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -102,6 +102,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIBCM203X
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_FW_LOADER
+	select ADK_KPACKAGE_KMOD_BT_HCIBTUSB
 	depends on ADK_KPACKAGE_KMOD_BT
 	help
 	  Bluetooth HCI BCM203x USB driver.