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.

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 3e72515d9f3740e184f81a7da3082b91c0adb78f..9cc00e88b71ad9e8ac102ed9d676abd51ee355d7 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 6aa5599003fe390cb545e1becf2837587f6eda23..4d22bc869327272986fa01d431ea7402637bbedf 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 \