summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/bluez/Makefile24
-rw-r--r--package/bluez/files/bluetooth.conf20
-rw-r--r--package/bluez/files/bluez.init4
3 files changed, 28 insertions, 20 deletions
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index ec92ca9ee..12c87639d 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -1,7 +1,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= bluez
PKG_VERSION:= 5.39
@@ -10,13 +10,14 @@ PKG_HASH:= 21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b
PKG_DESCR:= bluetooth applications
PKG_SECTION:= net/wifi
PKG_DEPENDS:= glib dbus libreadline
+PKG_KDEPENDS:= bt bt-l2cap bt-sco bt-rfcomm bt-hidp bt-bnep
PKG_BUILDDEP:= glib dbus readline
PKG_URL:= http://www.bluez.org/
PKG_SITES:= http://www.kernel.org/pub/linux/bluetooth/
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BLUEZ,bluez,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
TARGET_LDFLAGS+= -lncurses
@@ -39,13 +40,16 @@ CONFIGURE_ARGS+= --enable-tools \
--disable-cups
bluez-install:
- ${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
- ${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
- ${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin
- ${INSTALL_DIR} ${IDIR_BLUEZ}/etc/bluetooth
- $(INSTALL_DATA) ./files/main.conf \
- ${IDIR_BLUEZ}/etc/bluetooth
+ $(INSTALL_DIR) $(IDIR_BLUEZ)/etc/bluetooth
+ $(INSTALL_DIR) $(IDIR_BLUEZ)/etc/dbus-1/system.d
+ $(INSTALL_DIR) $(IDIR_BLUEZ)/usr/bin
+ $(INSTALL_DIR) $(IDIR_BLUEZ)/usr/libexec/bluetooth
+ $(INSTALL_BIN) $(WRKINST)/usr/libexec/bluetooth/bluetoothd \
+ $(IDIR_BLUEZ)/usr/libexec/bluetooth
+ $(CP) $(WRKINST)/usr/bin/* $(IDIR_BLUEZ)/usr/bin
+ $(INSTALL_DATA) $(WRKBUILD)/src/main.conf \
+ $(IDIR_BLUEZ)/etc/bluetooth
$(INSTALL_DATA) ./files/bluetooth.conf \
$(IDIR_BLUEZ)/etc/dbus-1/system.d
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/bluez/files/bluetooth.conf b/package/bluez/files/bluetooth.conf
index 796354692..5ea3cdfcc 100644
--- a/package/bluez/files/bluetooth.conf
+++ b/package/bluez/files/bluetooth.conf
@@ -10,20 +10,24 @@
<policy user="root">
<allow own="org.bluez"/>
<allow send_destination="org.bluez"/>
- <allow send_interface="org.bluez.Agent"/>
+ <allow send_interface="org.bluez.Agent1"/>
+ <allow send_interface="org.bluez.MediaEndpoint1"/>
+ <allow send_interface="org.bluez.MediaPlayer1"/>
+ <allow send_interface="org.bluez.ThermometerWatcher1"/>
+ <allow send_interface="org.bluez.AlertAgent1"/>
+ <allow send_interface="org.bluez.Profile1"/>
+ <allow send_interface="org.bluez.HeartRateWatcher1"/>
+ <allow send_interface="org.bluez.CyclingSpeedWatcher1"/>
+ <allow send_interface="org.bluez.GattCharacteristic1"/>
+ <allow send_interface="org.bluez.GattDescriptor1"/>
+ <allow send_interface="org.freedesktop.DBus.ObjectManager"/>
+ <allow send_interface="org.freedesktop.DBus.Properties"/>
</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>
diff --git a/package/bluez/files/bluez.init b/package/bluez/files/bluez.init
index ed4faa547..489b9714b 100644
--- a/package/bluez/files/bluez.init
+++ b/package/bluez/files/bluez.init
@@ -11,10 +11,10 @@ autostart)
exec sh $0 start
;;
start)
- /usr/sbin/bluetoothd
+ /usr/libexec/bluetooth/bluetoothd
;;
stop)
- kill $(pgrep -f /usr/sbin/bluetoothd)
+ kill $(pgrep -f /usr/libexec/bluetooth/bluetoothd)
;;
restart)
sh $0 stop