udev: Drop hid2hci, its provided by bluez4 now

Our bluez4 recipe provides hid2hci now. udev removes this as of version 169,
we might as well remove it now to stop conflicts over the file in both
target file systems and the build sysroots.

(From OE-Core rev: 1b5aa7ce6ef22c015e0ab8463ba528f916c421b0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 3e72515..9cc00e8 100644 (file)
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -86,4 +86,7 @@ do_install_append () {
 
        install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
        install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+       
+       # hid2hci has moved to bluez4. removed in udev as of version 169
+       rm -f ${D}${base_libdir}/udev/hid2hci
 }

diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 6aa5599..4d22bc8 100644 (file)
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
 include udev.inc
 
-PR = "r15"
+PR = "r16"
 
 SRC_URI += "file://udev-166-v4l1-1.patch \
             file://include_resource.patch \