summaryrefslogtreecommitdiff
path: root/package/bluez
diff options
context:
space:
mode:
Diffstat (limited to 'package/bluez')
-rw-r--r--package/bluez/Config.in10
-rw-r--r--package/bluez/Makefile26
-rw-r--r--package/bluez/files/bluetooth.conf31
-rw-r--r--package/bluez/files/bluez.init2
-rw-r--r--package/bluez/files/main.conf52
-rw-r--r--package/bluez/patches/patch-Makefile_in27
-rw-r--r--package/bluez/patches/patch-scripts_bluetooth_rules7
-rw-r--r--package/bluez/patches/patch-tools_hciattach_c8
8 files changed, 139 insertions, 24 deletions
diff --git a/package/bluez/Config.in b/package/bluez/Config.in
deleted file mode 100644
index 3bb4c4a37..000000000
--- a/package/bluez/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_BLUEZ
- prompt "bluez............................. Bluetooth library and tools"
- tristate
- default n
- select ADK_KPACKAGE_KMOD_BT
- help
- Bluez libs and apps.
-
- http://bluez.org
-
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 4c39c00b2..c2c13ddc8 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,12 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bluez
-PKG_VERSION:= 4.40
+PKG_VERSION:= 4.59
PKG_RELEASE:= 1
-PKG_MD5SUM:= a25fa37c97c309338649f6a5fd4cea76
+PKG_MD5SUM:= 1c7cee215bc84656b1edee019cee78f5
PKG_DESCR:= bluetooth libraries and applications
PKG_SECTION:= bluetooth
-PKG_DEPENDS:= kmod-bluetooth
+PKG_DEPENDS:= kmod-bt libusb glib dbus
+PKG_BUILDDEP+= libusb dbus glib
PKG_URL:= http://www.bluez.org
PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/}
@@ -17,7 +18,12 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BLUEZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE:= gnu
+ifeq ($(ADK_STATIC),y)
+XAKE_FLAGS+= V=1 CCLD="$(TARGET_CC) -all-static -pthread"
+else
+XAKE_FLAGS+= V=1
+endif
+CONFIGURE_ENV+= ac_cv_prog_cc_pie=no
CONFIGURE_ARGS+= --enable-tools \
--enable-alsa \
--enable-usb \
@@ -25,22 +31,24 @@ CONFIGURE_ARGS+= --enable-tools \
--enable-hidd \
--enable-pand \
--enable-dund \
+ --enable-netlink \
+ --disable-pie \
--disable-cups
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
post-install:
+ifneq ($(ADK_STATIC),y)
${INSTALL_DIR} ${IDIR_BLUEZ}/usr/lib
${CP} ${WRKINST}/usr/lib/libbluetooth.so.* ${IDIR_BLUEZ}/usr/lib/
+endif
${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}/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/bluez.init b/package/bluez/files/bluez.init
index 6a61d38cd..477013d9f 100644
--- a/package/bluez/files/bluez.init
+++ b/package/bluez/files/bluez.init
@@ -13,7 +13,7 @@ start)
bluetoothd
;;
stop)
- killall bluetoothd
+ pkill bluetoothd
;;
restart)
sh $0 stop
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/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in
new file mode 100644
index 000000000..4334402d7
--- /dev/null
+++ b/package/bluez/patches/patch-Makefile_in
@@ -0,0 +1,27 @@
+--- bluez-4.59.orig/Makefile.in Thu Dec 24 17:42:48 2009
++++ bluez-4.59/Makefile.in Tue Dec 29 01:31:12 2009
+@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_8) $(am
+ $(am__EXEEXT_10) $(am__EXEEXT_11)
+ @SBC_TRUE@am__append_1 = sbc/libsbc.la
+ @SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc
+-@SBC_TRUE@@SNDFILE_TRUE@am__append_3 = sbc/sbctester
+ @NETLINK_TRUE@am__append_4 = plugins/netlink.la
+ @ECHOPLUGIN_TRUE@am__append_5 = echo
+ @ECHOPLUGIN_TRUE@am__append_6 = plugins/echo.c
+@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(
+ @DUND_TRUE@am__EXEEXT_6 = compat/dund$(EXEEXT)
+ @SBC_TRUE@am__EXEEXT_7 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \
+ @SBC_TRUE@ sbc/sbcenc$(EXEEXT)
+-@SBC_TRUE@@SNDFILE_TRUE@am__EXEEXT_8 = sbc/sbctester$(EXEEXT)
+ @TOOLS_TRUE@am__EXEEXT_9 = tools/avinfo$(EXEEXT) tools/ppporc$(EXEEXT) \
+ @TOOLS_TRUE@ tools/hcieventmask$(EXEEXT) \
+ @TOOLS_TRUE@ tools/hcisecfilter$(EXEEXT)
+@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
+ @SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la
+ @SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
+ @SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la
+-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctester_LDADD = @SNDFILE_LIBS@
+-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@
+ @NETLINK_TRUE@plugins_netlink_la_LIBADD = @NETLINK_LIBS@
+ @NETLINK_TRUE@plugins_netlink_la_LDFLAGS = -module -avoid-version -no-undefined
+ @NETLINK_TRUE@plugins_netlink_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
diff --git a/package/bluez/patches/patch-scripts_bluetooth_rules b/package/bluez/patches/patch-scripts_bluetooth_rules
new file mode 100644
index 000000000..0ff2c0ef3
--- /dev/null
+++ b/package/bluez/patches/patch-scripts_bluetooth_rules
@@ -0,0 +1,7 @@
+--- bluez-4.59.orig/scripts/bluetooth.rules Thu Dec 24 17:43:09 2009
++++ bluez-4.59/scripts/bluetooth.rules Tue Dec 29 01:26:46 2009
+@@ -1,3 +1,3 @@
+ # Run helper every time a Bluetooth device appears
+ # On remove actions, bluetoothd should go away by itself
+-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev"
++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev"
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
index ae8f70f57..e5a84de4f 100644
--- a/package/bluez/patches/patch-tools_hciattach_c
+++ b/package/bluez/patches/patch-tools_hciattach_c
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bluez-4.12.orig/tools/hciattach.c 2008-08-05 23:14:56.000000000 +0200
-+++ bluez-4.12/tools/hciattach.c 2009-05-12 18:14:29.000000000 +0200
-@@ -107,6 +107,7 @@ static int uart_speed(int s)
+--- bluez-4.59.orig/tools/hciattach.c Tue May 19 11:04:10 2009
++++ bluez-4.59/tools/hciattach.c Tue Dec 29 01:26:35 2009
+@@ -100,6 +100,7 @@ static int uart_speed(int s)
return B57600;
case 115200:
return B115200;
@@ -9,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
case 230400:
return B230400;
case 460800:
-@@ -125,6 +126,7 @@ static int uart_speed(int s)
+@@ -118,6 +119,7 @@ static int uart_speed(int s)
return B1500000;
case 2000000:
return B2000000;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 11:17:43 +0000