From b51f72268874ad1f543ebe819e6a2a0864047dbb Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 14 Oct 2008 21:10:10 +0000 Subject: [PATCH] - Update udev rules (#246840) --- ...te-udev-rules-for-udev-098-and-newer.patch | 67 +++++++++++++++++++ ...debug-when-failing-to-probe-a-device.patch | 28 ++++++++ bluez.spec | 16 ++++- 3 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 0001-Update-udev-rules-for-udev-098-and-newer.patch create mode 100644 0002-Better-debug-when-failing-to-probe-a-device.patch diff --git a/0001-Update-udev-rules-for-udev-098-and-newer.patch b/0001-Update-udev-rules-for-udev-098-and-newer.patch new file mode 100644 index 0000000..bbdfd69 --- /dev/null +++ b/0001-Update-udev-rules-for-udev-098-and-newer.patch @@ -0,0 +1,67 @@ +From fcf1518fd2cc804d339b07d1bfbfd9386ac5da22 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 14 Oct 2008 21:58:02 +0100 +Subject: [PATCH] Update udev rules for udev 098 and newer + +As per https://bugzilla.redhat.com/show_bug.cgi?id=246840 +and the udev release notes, update the udev rules for newer +versions of udev (>= 098). +--- + scripts/bluetooth.rules | 24 ++++++++++++------------ + 1 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/scripts/bluetooth.rules b/scripts/bluetooth.rules +index 0957225..072335f 100644 +--- a/scripts/bluetooth.rules ++++ b/scripts/bluetooth.rules +@@ -1,35 +1,35 @@ + # Brain Boxes BL-620 Bluetooth Adapter +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Brain Boxes", SYSFS{prod_id2}=="Bluetooth PC Card", ENV{HCIOPTS}="bboxes", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Brain Boxes", ATTRS{prod_id2}=="Bluetooth PC Card", ENV{HCIOPTS}="bboxes", RUN+="bluetooth_serial" + + # Xircom CreditCard Bluetooth Adapter +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Xircom", ATTRS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial" + + # Xircom RealPort2 Bluetooth Adapter +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Xircom", ATTRS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial" + + # IBM Bluetooth PC Card II +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="IBM", SYSFS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="IBM", ATTRS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial" + + # TDK Bluetooth PC Card +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="TDK", SYSFS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="TDK", ATTRS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial" + + # AmbiCom BT2000C Bluetooth PC/CF Card +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="AmbiCom BT2000C", SYSFS{prod_id2}=="Bluetooth PC/CF Card", ENV{HCIOPTS}="bt2000c", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="AmbiCom BT2000C", ATTRS{prod_id2}=="Bluetooth PC/CF Card", ENV{HCIOPTS}="bt2000c", RUN+="bluetooth_serial" + + # COM One Platinium Bluetooth PC Card +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="COM1 SA", SYSFS{prod_id2}=="MC310 CARD", ENV{HCIOPTS}="comone", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="COM1 SA", ATTRS{prod_id2}=="MC310 CARD", ENV{HCIOPTS}="comone", RUN+="bluetooth_serial" + + # Sphinx PICO Card +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="SPHINX", SYSFS{prod_id2}=="BT-CARD", ENV{HCIOPTS}="picocard", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="SPHINX", ATTRS{prod_id2}=="BT-CARD", ENV{HCIOPTS}="picocard", RUN+="bluetooth_serial" + + # H-Soft blue+Card +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="H-Soft", SYSFS{prod_id2}=="Blue+CARD", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="H-Soft", ATTRS{prod_id2}=="Blue+CARD", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial" + + # Compaq iPAQ Bluetooth Sleeve, Belkin F8T020, any other muppet who used an OXCF950 and didn't bother to program it appropriately. +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="CF CARD", SYSFS{prod_id2}=="GENERIC", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="CF CARD", ATTRS{prod_id2}=="GENERIC", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial" + + # Zoom Bluetooth Card and Sitecom CN-504 Card +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="PCMCIA", SYSFS{prod_id2}=="Bluetooth Card", ENV{HCIOPTS}="zoom", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="PCMCIA", ATTRS{prod_id2}=="Bluetooth Card", ENV{HCIOPTS}="zoom", RUN+="bluetooth_serial" + + # CC&C BT0100M +-SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Bluetooth BT0100M", ENV{HCIOPTS}="bcsp 115200", RUN+="bluetooth_serial" ++SUBSYSTEM=="tty", SUBSYSTEMS=="pcmcia", ATTRS{prod_id1}=="Bluetooth BT0100M", ENV{HCIOPTS}="bcsp 115200", RUN+="bluetooth_serial" +-- +1.5.5.2 + diff --git a/0002-Better-debug-when-failing-to-probe-a-device.patch b/0002-Better-debug-when-failing-to-probe-a-device.patch new file mode 100644 index 0000000..05d50c3 --- /dev/null +++ b/0002-Better-debug-when-failing-to-probe-a-device.patch @@ -0,0 +1,28 @@ +From 5c71324238e5380530a298bb63ec9d79b7a1f219 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 14 Oct 2008 21:58:51 +0100 +Subject: [PATCH] Better debug when failing to probe a device + +The previous error message was a bit terse. +--- + src/device.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/device.c b/src/device.c +index 7294d3c..2a48406 100644 +--- a/src/device.c ++++ b/src/device.c +@@ -646,8 +646,8 @@ void device_probe_drivers(struct btd_device *device, GSList *uuids) + + err = driver->probe(device, probe_uuids); + if (err < 0) { +- error("probe failed for driver %s", +- driver->name); ++ error("probe failed with driver %s for device %s", ++ driver->name, device->path); + + g_free(driver_data); + g_slist_free(probe_uuids); +-- +1.5.5.2 + diff --git a/bluez.spec b/bluez.spec index ab741ee..f867a60 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,14 +1,19 @@ Summary: Bluetooth utilities Name: bluez Version: 4.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz Source1: bluetooth.init Source2: bluetooth.conf Patch1: bluez-utils-oui-usage.patch -Patch2: 0001-Fix-PS3-BD-remote-input-event-generation.patch +# http://thread.gmane.org/gmane.linux.bluez.kernel/561 +Patch2: 0001-Update-udev-rules-for-udev-098-and-newer.patch +# http://thread.gmane.org/gmane.linux.bluez.kernel/562 +Patch3: 0002-Better-debug-when-failing-to-probe-a-device.patch +# http://thread.gmane.org/gmane.linux.bluez.kernel/554 +Patch4: 0001-Fix-PS3-BD-remote-input-event-generation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -97,7 +102,9 @@ use in Bluetooth applications. %setup -q %patch1 -p0 -b .oui -%patch2 -p1 -b .ps3 +%patch2 -p1 -b .udev +%patch3 -p1 -b .debug +%patch4 -p1 -b .ps3 %build %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund @@ -183,6 +190,9 @@ fi %{_libdir}/alsa-lib/*.so %changelog +* Tue Oct 14 2008 - Bastien Nocera - 4.13-3 +- Update udev rules (#246840) + * Mon Oct 13 2008 - Bastien Nocera - 4.13-2 - Fix PS3 BD remote input event generation