From ec23ba9501288c47373ca5818c49d8e1722680ec Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 30 Nov 2013 16:53:14 +0200 Subject: [PATCH] bluez: update to bluez-5.11 --- packages/network/bluez/package.mk | 2 +- .../bluez/patches/bluez-fix-hid2hci.patch | 47 ------------------- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 packages/network/bluez/patches/bluez-fix-hid2hci.patch diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 4ad9b1d5f1..3268eed7dd 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bluez" -PKG_VERSION="5.10" +PKG_VERSION="5.11" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/bluez/patches/bluez-fix-hid2hci.patch b/packages/network/bluez/patches/bluez-fix-hid2hci.patch deleted file mode 100644 index 7a540c7a8a..0000000000 --- a/packages/network/bluez/patches/bluez-fix-hid2hci.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Giovanni Campagna - -The paths under /dev, in the default udev configuration, are formatted -with two leading zeros, but the number obtained from sysfs don't have -them, so we must convert them to integers and reformat them. - -Signed-off-by: Giovanni Campagna ---- - tools/hid2hci.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/tools/hid2hci.c b/tools/hid2hci.c -index bb8a521..76d0b5a 100644 ---- a/tools/hid2hci.c -+++ b/tools/hid2hci.c -@@ -221,18 +221,21 @@ static int usb_switch_dell(int fd, enum mode mode) - static int find_device(struct udev_device *udev_dev) - { - char path[PATH_MAX]; -- const char *busnum, *devnum; -+ const char *busnum_s, *devnum_s; -+ int busnum, devnum; - int fd; - -- busnum = udev_device_get_sysattr_value(udev_dev, "busnum"); -- if (!busnum) -+ busnum_s = udev_device_get_sysattr_value(udev_dev, "busnum"); -+ if (!busnum_s) - return -1; -+ busnum = strtol(busnum_s, NULL, 10); - -- devnum = udev_device_get_sysattr_value(udev_dev, "devnum"); -- if (!devnum) -+ devnum_s = udev_device_get_sysattr_value(udev_dev, "devnum"); -+ if (!devnum_s) - return -1; -+ devnum = strtol(devnum_s, NULL, 10); - -- snprintf(path, sizeof(path), "/dev/bus/usb/%s/%s", busnum, devnum); -+ snprintf(path, sizeof(path), "/dev/bus/usb/%03d/%03d", busnum, devnum); - - fd = open(path, O_RDWR, O_CLOEXEC); - if (fd < 0) { --- -1.8.3.1 - ---