summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/udev
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 16:46:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-29 16:01:41 -0700
commit8354db9258614578da063edb6e237c36304a032f (patch)
tree920727addcbd5d5bac1b12812cc709635d21cfd8 /meta/recipes-core/udev
parent93d647172786a84568f02ab465a926e27440d99b (diff)
downloadpoky-8354db9258614578da063edb6e237c36304a032f.tar.gz
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>
Diffstat (limited to 'meta/recipes-core/udev')
-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 () {
86 86
87 install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh 87 install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
88 install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts 88 install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
89
90 # hid2hci has moved to bluez4. removed in udev as of version 169
91 rm -f ${D}${base_libdir}/udev/hid2hci
89} 92}
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 @@
1include udev.inc 1include udev.inc
2 2
3PR = "r15" 3PR = "r16"
4 4
5SRC_URI += "file://udev-166-v4l1-1.patch \ 5SRC_URI += "file://udev-166-v4l1-1.patch \
6 file://include_resource.patch \ 6 file://include_resource.patch \