bluez: Updated to 4.101

This commit is contained in:
Alan Mizrahi 2013-01-23 16:51:54 +09:00
parent befc9885eb
commit e6599db24b
5 changed files with 131 additions and 54 deletions

View File

@ -1,4 +1,11 @@
drwxr-xr-x root/root etc/
drwxr-xr-x root/root etc/bluetooth/
-rw-r--r-- root/root etc/bluetooth/audio.conf
-rw-r--r-- root/root etc/bluetooth/input.conf
-rw-r--r-- root/root etc/bluetooth/main.conf
-rw-r--r-- root/root etc/bluetooth/network.conf
-rw-r--r-- root/root etc/bluetooth/rfcomm.conf
-rw-r--r-- root/root etc/bluetooth/serial.conf
drwxr-xr-x root/root etc/rc.d/
-rwxr-xr-x root/root etc/rc.d/bluetooth
drwxr-xr-x root/root lib/
@ -8,12 +15,48 @@ drwxr-xr-x root/root lib/udev/rules.d/
-rw-r--r-- root/root lib/udev/rules.d/97-bluetooth-hid2hci.rules
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/bluez-avctrl
-rwxr-xr-x root/root usr/bin/bluez-avinfo
-rwxr-xr-x root/root usr/bin/bluez-ciptool
-rwxr-xr-x root/root usr/bin/bluez-dfubabel
-rwxr-xr-x root/root usr/bin/bluez-hciattach
-rwxr-xr-x root/root usr/bin/bluez-hciconfig
-rwxr-xr-x root/root usr/bin/bluez-hcieventmask
-rwxr-xr-x root/root usr/bin/bluez-hcisecfilter
-rwxr-xr-x root/root usr/bin/bluez-hcitool
-rwxr-xr-x root/root usr/bin/bluez-hid2hci
-rwxr-xr-x root/root usr/bin/bluez-hsmicro
-rwxr-xr-x root/root usr/bin/bluez-hsplay
-rwxr-xr-x root/root usr/bin/bluez-l2ping
-rwxr-xr-x root/root usr/bin/bluez-list-devices
-rwxr-xr-x root/root usr/bin/bluez-monitor-bluetooth
-rwxr-xr-x root/root usr/bin/bluez-ppporc
-rwxr-xr-x root/root usr/bin/bluez-rfcomm
-rwxr-xr-x root/root usr/bin/bluez-sdptool
-rwxr-xr-x root/root usr/bin/bluez-simple-agent
-rwxr-xr-x root/root usr/bin/bluez-simple-endpoint
-rwxr-xr-x root/root usr/bin/bluez-simple-player
-rwxr-xr-x root/root usr/bin/bluez-simple-service
-rwxr-xr-x root/root usr/bin/bluez-test-adapter
-rwxr-xr-x root/root usr/bin/bluez-test-attrib
-rwxr-xr-x root/root usr/bin/bluez-test-audio
-rwxr-xr-x root/root usr/bin/bluez-test-device
-rwxr-xr-x root/root usr/bin/bluez-test-discovery
-rwxr-xr-x root/root usr/bin/bluez-test-health
-rwxr-xr-x root/root usr/bin/bluez-test-health-sink
-rwxr-xr-x root/root usr/bin/bluez-test-input
-rwxr-xr-x root/root usr/bin/bluez-test-manager
-rwxr-xr-x root/root usr/bin/bluez-test-nap
-rwxr-xr-x root/root usr/bin/bluez-test-network
-rwxr-xr-x root/root usr/bin/bluez-test-oob
-rwxr-xr-x root/root usr/bin/bluez-test-proximity
-rwxr-xr-x root/root usr/bin/bluez-test-sap-server
-rwxr-xr-x root/root usr/bin/bluez-test-serial
-rwxr-xr-x root/root usr/bin/bluez-test-serial-proxy
-rwxr-xr-x root/root usr/bin/bluez-test-service
-rwxr-xr-x root/root usr/bin/bluez-test-telephony
-rwxr-xr-x root/root usr/bin/bluez-test-thermometer
-rwxr-xr-x root/root usr/bin/ciptool
-rwxr-xr-x root/root usr/bin/dfutool
-rwxr-xr-x root/root usr/bin/dund
-rwxr-xr-x root/root usr/bin/gatttool
-rwxr-xr-x root/root usr/bin/hcitool
-rwxr-xr-x root/root usr/bin/hidd
@ -21,17 +64,9 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/pand
-rwxr-xr-x root/root usr/bin/rfcomm
-rwxr-xr-x root/root usr/bin/sdptool
drwxr-xr-x root/root usr/etc/
drwxr-xr-x root/root usr/etc/bluetooth/
-rw-r--r-- root/root usr/etc/bluetooth/audio.conf
-rw-r--r-- root/root usr/etc/bluetooth/input.conf
-rw-r--r-- root/root usr/etc/bluetooth/main.conf
-rw-r--r-- root/root usr/etc/bluetooth/network.conf
-rw-r--r-- root/root usr/etc/bluetooth/rfcomm.conf
-rw-r--r-- root/root usr/etc/bluetooth/serial.conf
drwxr-xr-x root/root usr/etc/dbus-1/
drwxr-xr-x root/root usr/etc/dbus-1/system.d/
-rw-r--r-- root/root usr/etc/dbus-1/system.d/bluetooth.conf
drwxr-xr-x root/root usr/dbus-1/
drwxr-xr-x root/root usr/dbus-1/system.d/
-rw-r--r-- root/root usr/dbus-1/system.d/bluetooth.conf
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/bluetooth/
-rw-r--r-- root/root usr/include/bluetooth/a2mp.h
@ -63,36 +98,45 @@ drwxr-xr-x root/root usr/lib/gstreamer-0.10/
-rwxr-xr-x root/root usr/lib/gstreamer-0.10/libgstbluetooth.la
-rwxr-xr-x root/root usr/lib/gstreamer-0.10/libgstbluetooth.so
-rwxr-xr-x root/root usr/lib/libbluetooth.la
lrwxrwxrwx root/root usr/lib/libbluetooth.so -> libbluetooth.so.3.12.0
lrwxrwxrwx root/root usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.12.0
-rwxr-xr-x root/root usr/lib/libbluetooth.so.3.12.0
lrwxrwxrwx root/root usr/lib/libbluetooth.so -> libbluetooth.so.3.13.0
lrwxrwxrwx root/root usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.13.0
-rwxr-xr-x root/root usr/lib/libbluetooth.so.3.13.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/bluez.pc
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/bluez-ciptool.1.gz
-rw-r--r-- root/root usr/man/man1/bluez-dfubabel.1.gz
-rw-r--r-- root/root usr/man/man1/bluez-hcitool.1.gz
-rw-r--r-- root/root usr/man/man1/bluez-rfcomm.1.gz
-rw-r--r-- root/root usr/man/man1/bluez-sdptool.1.gz
-rw-r--r-- root/root usr/man/man1/ciptool.1.gz
-rw-r--r-- root/root usr/man/man1/dfutool.1.gz
-rw-r--r-- root/root usr/man/man1/dund.1.gz
-rw-r--r-- root/root usr/man/man1/hcitool.1.gz
-rw-r--r-- root/root usr/man/man1/hidd.1.gz
-rw-r--r-- root/root usr/man/man1/pand.1.gz
-rw-r--r-- root/root usr/man/man1/rfcomm.1.gz
-rw-r--r-- root/root usr/man/man1/sdptool.1.gz
drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/bccmd.8.gz
-rw-r--r-- root/root usr/man/man8/bluetoothd.8.gz
-rw-r--r-- root/root usr/man/man8/bluez-avctrl.8.gz
-rw-r--r-- root/root usr/man/man8/bluez-hciattach.8.gz
-rw-r--r-- root/root usr/man/man8/bluez-hciconfig.8.gz
-rw-r--r-- root/root usr/man/man8/bluez-hid2hci.8.gz
-rw-r--r-- root/root usr/man/man8/bluez-l2ping.8.gz
-rw-r--r-- root/root usr/man/man8/hciattach.8.gz
-rw-r--r-- root/root usr/man/man8/hciconfig.8.gz
-rw-r--r-- root/root usr/man/man8/hid2hci.8.gz
-rw-r--r-- root/root usr/man/man8/l2ping.8.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/bccmd
-rwxr-xr-x root/root usr/sbin/bluetoothd
-rwxr-xr-x root/root usr/sbin/hciattach
-rwxr-xr-x root/root usr/sbin/hciconfig
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/alsa/
-rw-r--r-- root/root usr/share/alsa/bluetooth.conf
drwxr-xr-x root/root usr/share/dbus-1/
drwxr-xr-x root/root usr/share/dbus-1/system-services/
-rw-r--r-- root/root usr/share/dbus-1/system-services/org.bluez.service
drwxr-xr-x root/root var/
drwxr-xr-x root/root var/lib/
drwxr-xr-x root/root var/lib/bluetooth/

View File

@ -1,2 +1,2 @@
47bbb7141c099be7e3c4e8ed7de6ffd6 bluetooth.rc
570aa10692ed890aa0a4297b37824912 bluez-4.99.tar.gz
cc63789c7582ba76353e75e28087390d bluetooth.rc
c828c172f01f20c6ecd7f407894956a2 bluez-4.101.tar.xz

View File

@ -1,46 +1,60 @@
# Description: Bluetooth libraries and utilities
# URL: http://www.bluez.org
# URL: http://www.bluez.org/
# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve
# Depends on: dbus
# Depends on: dbus alsa-lib gstreamer libusb-compat
# Optional: pygobject dbus-python
name=bluez
version=4.99
version=4.101
release=1
source=(http://www.kernel.org/pub/linux/bluetooth/$name-$version.tar.gz bluetooth.rc)
source=(http://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz bluetooth.rc)
build() {
# note: sysconfdir is /usr/etc instead of /etc on purpose
# in CRUX some people use /usr/etc for config files, I know its stupid
cd $name-$version
./configure \
--prefix=/usr \
--sysconfdir=/usr/etc \
--mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/lib \
--mandir=/usr/man \
--enable-audio \
--enable-gstreamer \
--enable-usb \
--enable-tools \
--enable-hid2hci \
--disable-test \
--enable-hidd \
--enable-hid2hci \
--enable-pand \
--enable-dund \
--enable-cups \
--enable-alsa \
--enable-bccmd \
--enable-dfutool \
--enable-cups \
--enable-gstreamer \
--disable-test
--enable-dund
make
make DESTDIR=$PKG install
for i in network input audio serial; do
cp $i/$i.conf $PKG/usr/etc/bluetooth
# install all available tools and test programs with man pages
shopt -s nullglob
for i in test/* tools/*; do
if [ -x $i ]; then
install -D -m 755 $i $PKG/usr/bin/bluez-${i#*/}
for j in $i.[1-8]; do
install -D -m 644 $j $PKG/usr/man/man${j##*.}/bluez-${j##*/}
done
fi
done
install -m 755 -o root -g root -D test/simple-agent $PKG/usr/bin/bluez-simple-agent
install -m 755 -o root -g root -D test/test-device $PKG/usr/bin/bluez-test-device
install -m 755 -o root -g root -D test/test-input $PKG/usr/bin/bluez-test-input
install -m 755 -o root -g root -D $SRC/bluetooth.rc $PKG/etc/rc.d/bluetooth
# install init script
install -D -m 755 $SRC/bluetooth.rc $PKG/etc/rc.d/bluetooth
rm $PKG/lib/udev/rules.d/97-bluetooth.rules
# install config files
for i in audio input network serial; do
install -D -m 644 $i/$i.conf $PKG/etc/bluetooth/$i.conf
done
# this is because of the /usr/etc CRUX oddity
mkdir $PKG/usr/etc
mv $PKG/etc/dbus-1 $PKG/usr/etc
}

View File

@ -1,4 +1,7 @@
Bluetooth uses dbus for inter-process communication.
Bluez uses dbus for inter-process communication.
If your desktop applications are unable to connect to the bluetooth daemon
please check the bluetooth security policies in
/usr/etc/dbus-1/system.d/bluetooth.conf
pygobject 3.2.2 and dbus-python are required for the tools for pairing and such,
but they can be omitted at will.

View File

@ -1,27 +1,43 @@
#!/bin/sh
#
# /etc/rc.d/bluetooth: start/stop bluetooth daemon
# bluetooth startup script
#
# Note:
# To connect to an input device at boot time, add:
# hidd --connect XX:XX:XX:XX:XX:XX
NAME=bluetoothd
DAEMON=/usr/sbin/bluetoothd
case $1 in
start)
/usr/sbin/bluetoothd
pid=$(pgrep -f -x $DAEMON)
if [ -n "$pid" ]; then
echo "$NAME is already running with pid $pid" >&2
exit 1
fi
$DAEMON
;;
stop)
killall -e -q bluetoothd
pid=$(pgrep -f -x $DAEMON)
if [ -z "$pid" ]; then
echo "$NAME is not running" >&2
exit 1
fi
kill $pid
t=0
while [ -d /proc/$pid -a $t -lt 10 ]; do
sleep 0.5
let t++
done
if [ -d /proc/$pid ]; then
echo "$NAME still running with pid $pid" >&2
exit 1
fi
;;
restart)
$0 stop
sleep 2
$0 start
;;
*)
echo "usage: $0 [start|stop|restart]"
echo "Usage: $0 [start|stop|restart]" >&2
exit 1
;;
esac
# End of file