rpms/bluez
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Remove hid2hci calls, they're in udev now

Browse Source 
- Work-around udev bug, bluetoothd wasn't getting enabled on coldplug
This commit is contained in:
Bastien Nocera 2009-08-05 10:08:53 +00:00
parent 42de14827b
commit 797e3b4e5f
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bluetooth.conf
View File

@ -1,7 +0,0 @@
# Enable this to use hid2hci to switch a Bluetooth device in USB HID mode
# to HCI mode for Bluetooth operation.
#HID2HCI_ENABLE=true
# Enable this to switch capable devices back to HID mode on Bluetooth shutdown
#HID2HCI_UNDO=true

22
bluetooth.init
View File

@ -4,8 +4,8 @@
# description: Turn HID adapters into Bluetooth ones # description: Turn HID adapters into Bluetooth ones
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
# Short-Description: Turn HID adapters into Bluetooth ones # Short-Description: Trigger bluetoothd start-up
# Description: Turn HID adapters into Bluetooth ones # Description: Trigger bluetoothd start-up
### END INIT INFO ### END INIT INFO
# Source function library. # Source function library.
@ -15,21 +15,18 @@
start() start()
{ {
echo -n $"Starting hid2hci:" echo -n $"Enabling Bluetooth devices:"
[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || : udevadm trigger --subsystem-match=bluetooth
RETVAL=$?
touch /var/lock/subsys/bluetooth
echo "" echo ""
return $RETVAL return 0
} }
stop() stop()
{ {
# FIXME If somebody figures out how to disable the K* script
echo -n "Stopping Bluetooth services:" echo -n "Stopping Bluetooth services:"
[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
RETVAL=$?
echo "" echo ""
return $RETVAL return 0
} }
case "$1" in case "$1" in
@ -39,11 +36,8 @@ case "$1" in
stop) stop)
stop stop
;; ;;
status)
RETVAL=0
;;
*) *)
echo $"Usage: $0 {start|stop|status}" echo $"Usage: $0 {start|stop}"
exit 3 exit 3
;; ;;
esac esac

11
bluez.spec
View File

@ -1,12 +1,11 @@
Summary: Bluetooth utilities Summary: Bluetooth utilities
Name: bluez Name: bluez
Version: 4.47 Version: 4.47
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
Source1: bluetooth.init Source1: bluetooth.init
Source2: bluetooth.conf
Source3: dund.init Source3: dund.init
Source4: dund.conf Source4: dund.conf
Source5: pand.init Source5: pand.init
@ -134,7 +133,7 @@ This includes hidd, dund and pand.
%build %build
libtoolize -f -c libtoolize -f -c
autoreconf autoreconf
%configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund %configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
make make
%install %install
@ -223,7 +222,6 @@ fi
%{_mandir}/man8/* %{_mandir}/man8/*
%dir %{_sysconfdir}/bluetooth/ %dir %{_sysconfdir}/bluetooth/
%config(noreplace) %{_sysconfdir}/bluetooth/* %config(noreplace) %{_sysconfdir}/bluetooth/*
%config(noreplace) %{_sysconfdir}/sysconfig/bluetooth
%config(noreplace) %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules %config(noreplace) %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
%config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
%{_libdir}/bluetooth/ %{_libdir}/bluetooth/
@ -270,6 +268,11 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/pand %config(noreplace) %{_sysconfdir}/sysconfig/pand
%changelog %changelog
* Wed Aug 05 2009 Bastien Nocera <bnocera@redhat.com> 4.47-2
- Remove hid2hci calls, they're in udev now
- Work-around udev bug, bluetoothd wasn't getting enabled
on coldplug
* Sun Aug 02 2009 Bastien Nocera <bnocera@redhat.com> 4.47-1 * Sun Aug 02 2009 Bastien Nocera <bnocera@redhat.com> 4.47-1
- Update to 4.47 - Update to 4.47