From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 17 Aug 2008 12:46:13 +0000 (+0200)
Subject: Update some bluetooth config files and add some missing binaries
X-Git-Tag: v2.3-beta3~23
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=108b0cc3b53671c1df18ed09cc87e84c63e7501f

Update some bluetooth config files and add some missing binaries
---

diff --git a/config/rootfiles/packages/bluez b/config/rootfiles/packages/bluez
index 470c1ccb62..be91b7f3b1 100644
--- a/config/rootfiles/packages/bluez
+++ b/config/rootfiles/packages/bluez
@@ -7,7 +7,12 @@ etc/rc.d/rc6.d/K84bluetooth
 #etc/bluetooth
 etc/bluetooth/hcid.conf
 etc/bluetooth/rfcomm.conf
+etc/bluetooth/audio.conf
+etc/bluetooth/main.conf
+etc/bluetooth/input.conf
+etc/bluetooth/network.conf
 etc/dbus-1/system.d/bluetooth.conf
+etc/udev/rules.d/24-bluetooth.rules
 lib/firmware/BCM-LEGAL.txt
 lib/firmware/BCM2033-FW.bin
 lib/firmware/BCM2033-MD.hex
@@ -15,12 +20,19 @@ lib/firmware/STLC2500_R4_00_03.ptc
 lib/firmware/STLC2500_R4_00_06.ssf
 lib/firmware/STLC2500_R4_02_02_WLAN.ssf
 lib/firmware/STLC2500_R4_02_04.ptc
+lib/udev/bluetooth_serial
 usr/bin/ciptool
+usr/bin/dfutool
+usr/bin/dund
 usr/bin/hcitool
+usr/bin/hidd
 usr/bin/l2ping
+usr/bin/l2test
+usr/bin/pand
+usr/bin/passkey-agent
+usr/bin/rctest
 usr/bin/rfcomm
 usr/bin/sdptool
-usr/bin/passkey-agent
 #usr/include/bluetooth
 #usr/include/bluetooth/bluetooth.h
 #usr/include/bluetooth/bnep.h
@@ -47,25 +59,35 @@ usr/lib/bluetooth/plugins/input.so
 usr/lib/bluetooth/plugins/network.so
 #usr/lib/bluetooth/plugins/serial.la
 usr/lib/bluetooth/plugins/serial.so
+usr/lib/cups/backend/bluetooth
 #usr/lib/libbluetooth.a
 #usr/lib/libbluetooth.la
 usr/lib/libbluetooth.so
 usr/lib/libbluetooth.so.2
 usr/lib/libbluetooth.so.2.11.2
 #usr/lib/pkgconfig/bluez.pc
+usr/sbin/bccmd
 usr/sbin/hciattach
 usr/sbin/hciconfig
 usr/sbin/hcid
 usr/sbin/hcidump
+#usr/sbin/hciemu
+usr/sbin/hid2hci
 #usr/share/aclocal/bluez.m4
 #usr/share/man/man1/ciptool.1
+#usr/share/man/man1/dfutool.1
+#usr/share/man/man1/dund.1
 #usr/share/man/man1/hcitool.1
+#usr/share/man/man1/hidd.1
 #usr/share/man/man1/l2ping.1
+#usr/share/man/man1/pand.1
 #usr/share/man/man1/rfcomm.1
 #usr/share/man/man1/sdptool.1
 #usr/share/man/man5/hcid.conf.5
+#usr/share/man/man8/bccmd.8
 #usr/share/man/man8/hciattach.8
 #usr/share/man/man8/hciconfig.8
 #usr/share/man/man8/hcid.8
 #usr/share/man/man8/hcidump.8
+#usr/share/man/man8/hid2hci.8
 var/lib/bluetooth
diff --git a/lfs/bluez b/lfs/bluez
index 6ced28d151..dc056beafa 100644
--- a/lfs/bluez
+++ b/lfs/bluez
@@ -91,7 +91,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC) && tar xzf $(DIR_DL)/bluez-utils-$(VER).tar.gz
 	cd $(DIR_SRC)/bluez-utils-$(VER) && ./configure --prefix=/usr \
 	    --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib \
-	    --enable-test
+	    --enable-alsa --enable-usb --enable-netlink --enable-tools \
+	    --enable-bccmd --enable-hid2hci --enable-dfutool --enable-hidd \
+	    --enable-pand --enable-dund --enable-cups --enable-test \
+	    --enable-configfiles --enable-pcmciarules
 	cd $(DIR_SRC)/bluez-utils-$(VER) && make $(MAKETUNING)
 	cd $(DIR_SRC)/bluez-utils-$(VER) && make install
 	cd $(DIR_SRC)/bluez-utils-$(VER) && install -m 755 \
@@ -105,5 +108,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	    --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
 	cd $(DIR_SRC)/bluez-hcidump-1.42 && make $(MAKETUNING)
 	cd $(DIR_SRC)/bluez-hcidump-1.42 && make install
+	mv -f /etc/udev/bluetooth.rules /etc/udev/rules.d/24-bluetooth.rules
+	# Change bluetooth peername to Hostname-devicenumber
+	sed -i -e 's|name "BlueZ (%d)";|name "%h-%d";|g' /etc/bluetooth/hcid.conf
+	# Create empty config files
+	echo '# Bluetooth audio configuration' > /etc/bluetooth/audio.conf
+	echo '# Bluetooth main configuration' > /etc/bluetooth/main.conf
+	echo '# Bluetooth input configuration' > /etc/bluetooth/input.conf
+	echo '# Bluetooth network configuration' > /etc/bluetooth/network.conf
+	echo '# Bluetooth rfcomm configuration' > /etc/bluetooth/rfcomm.conf
 	@rm -rf $(DIR_SRC)/bluez*
 	@$(POSTBUILD)