Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=32ab8271236f49f6ffd6d612ea38d19d5a2c2cf7
commit 32ab8271236f49f6ffd6d612ea38d19d5a2c2cf7 Author: James Buren <[email protected]> Date: Sat Apr 7 00:41:35 2012 -0500 bluez-4.99-1-x86_64 * add patch for trying to workaround bluetoothd udev starting too early diff --git a/source/apps/bluez/FrugalBuild b/source/apps/bluez/FrugalBuild index a4785e7..fdf7e1e 100644 --- a/source/apps/bluez/FrugalBuild +++ b/source/apps/bluez/FrugalBuild @@ -11,8 +11,10 @@ groups=('apps') archs=('i686' 'x86_64') up2date="Flasttar http://www.bluez.org/download/"; source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.gz \ - Fix_netdevgroup.diff) + bluetoothd-udev-wrapper bluetoothd-udev-wrapper.patch Fix_netdevgroup.diff) sha1sums=('a9ecfb0822b06d51be311ad14247bae65ca8eb36' \ + '784a305b5dfac1ff5a40f6ab7ccad9ce252f8948' \ + 'd0e45a476d9cff372ab5a6488eedcca929b76a3b' \ '21f7a64b47eb9578c91799a341a3a7ef67d786b6') conflicts=('bluez-utils' 'bluez-libs') provides=('bluez-utils' 'bluez-libs') @@ -46,6 +48,7 @@ build() { for i in simple-agent test-device test-input; do Fexerel test/$i /usr/bin/bluez-$i done + Fexe /usr/sbin/bluetoothd-udev-wrapper } # optimization OK diff --git a/source/apps/bluez/bluetoothd-udev-wrapper b/source/apps/bluez/bluetoothd-udev-wrapper new file mode 100644 index 0000000..6416997 --- /dev/null +++ b/source/apps/bluez/bluetoothd-udev-wrapper @@ -0,0 +1,14 @@ +#!/bin/sh + +TIMEOUT=600 +COMMAND='/usr/sbin/bluetoothd --udev' + +# Sleep for up to $TIMEOUT, waiting for dbus service to start. +for i in `seq 0 $TIMEOUT`; do + if systemctl is-active dbus.service &> /dev/null; then + break + fi + sleep 1 +done + +exec $COMMAND diff --git a/source/apps/bluez/bluetoothd-udev-wrapper.patch b/source/apps/bluez/bluetoothd-udev-wrapper.patch new file mode 100644 index 0000000..d06293c --- /dev/null +++ b/source/apps/bluez/bluetoothd-udev-wrapper.patch @@ -0,0 +1,10 @@ +diff -ur a/scripts/bluetooth.rules.in b/scripts/bluetooth.rules.in +--- a/scripts/bluetooth.rules.in 2010-10-02 18:25:27.000000000 -0500 ++++ b/scripts/bluetooth.rules.in 2012-04-07 00:38:30.223796262 -0500 +@@ -1,4 +1,4 @@ + # Run helper every time a Bluetooth device appears + # On remove actions, bluetoothd should go away by itself +-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev" +-ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev" ++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd-udev-wrapper" ++ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd-udev-wrapper" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
