summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 16:46:48 +0100
committerSaul Wold <sgw@linux.intel.com>2012-08-28 08:03:39 -0700
commit1b5aa7ce6ef22c015e0ab8463ba528f916c421b0 (patch)
tree4d6b33b1300578c3d162ee77e718ee50abb220d9
parent98b1b9f047ef9a4aeb170ec3d588fcd41c9be89b (diff)
downloadopenembedded-core-1b5aa7ce6ef22c015e0ab8463ba528f916c421b0.tar.gz
openembedded-core-1b5aa7ce6ef22c015e0ab8463ba528f916c421b0.tar.bz2
openembedded-core-1b5aa7ce6ef22c015e0ab8463ba528f916c421b0.zip
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>
-rw-r--r--meta/recipes-core/udev/udev.inc3
-rw-r--r--meta/recipes-core/udev/udev_164.bb2
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 3e72515d9f..9cc00e88b7 100644
--- 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 6aa5599003..4d22bc8693 100644
--- 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 \