bluez: update to bluez-4.99, this fixes #646, depends on systemd, add patch for systemd

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-05-28 20:25:13 +02:00
parent 94324a053b
commit 3cb03727d4
4 changed files with 28 additions and 16 deletions

View File

@ -64,7 +64,6 @@ cd $PKG_BUILD
--disable-gstreamer \
$BLUEZ_ALSA \
--enable-usb \
--disable-tracer \
--enable-datafiles \
--enable-pcmcia \
--enable-hid2hci \

View File

@ -58,23 +58,23 @@ fi
mkdir -p $INSTALL/usr/lib/bluetooth/plugins
mkdir -p $INSTALL/usr/sbin
cp $PKG_BUILD/src/.libs/bluetoothd $INSTALL/usr/sbin
cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/sbin
mkdir -p $INSTALL/usr/share/alsa
cp $PKG_BUILD/audio/bluetooth.conf $INSTALL/usr/share/alsa
if [ "$DEVTOOLS" = "yes" ]; then
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/ciptool $INSTALL/usr/bin
cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin
cp $PKG_BUILD/tools/dfutool $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hcitool $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/l2ping $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/rfcomm $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/sdptool $INSTALL/usr/bin
cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin
cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin
cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin
cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin
mkdir -p $INSTALL/usr/sbin
cp $PKG_BUILD/tools/.libs/bccmd $INSTALL/usr/sbin # TODO
cp $PKG_BUILD/tools/.libs/hciattach $INSTALL/usr/sbin
cp $PKG_BUILD/tools/.libs/hciconfig $INSTALL/usr/sbin
cp $PKG_BUILD/tools/bccmd $INSTALL/usr/sbin # TODO
cp $PKG_BUILD/tools/hciattach $INSTALL/usr/sbin
cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/sbin
fi

View File

@ -19,16 +19,14 @@
################################################################################
PKG_NAME="bluez"
PKG_VERSION="4.96"
PKG_VERSION="4.99"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.bluez.org/"
#PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="libusb-compat dbus glib"
PKG_BUILD_DEPENDS="toolchain libusb-compat dbus glib"
PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="libusb-compat dbus glib systemd"
PKG_BUILD_DEPENDS="toolchain libusb-compat dbus glib systemd"
PKG_PRIORITY="optional"
PKG_SECTION="network"
PKG_SHORTDESC="bluez: Bluetooth Tools and System Daemons for Linux."

View File

@ -0,0 +1,15 @@
X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=blobdiff_plain;f=tools%2Fhid2hci.c;h=e3a5b2ef785a782bd3da4ae9c44704a32dc2f665;hp=45a3a3db8b29411ee193e480f5ce8a82a40103d1;hb=35beaaa5b39d50eabd54563804182bb01a5d7ff4;hpb=cc47dc79aac98f7b25bd2afccf1c10560e779d16
diff --git a/tools/hid2hci.c b/tools/hid2hci.c
index 45a3a3d..e3a5b2e 100644
--- a/tools/hid2hci.c
+++ b/tools/hid2hci.c
@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
if (udev == NULL)
goto exit;
- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath);
+ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath);
udev_dev = udev_device_new_from_syspath(udev, syspath);
if (udev_dev == NULL) {
fprintf(stderr, "error: could not find '%s'\n", devpath);