summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-09 15:08:09 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-09 15:08:09 +0100
commit144e7b461d36469e95c8c8c209c53c1cf5c888d0 (patch)
treecbd04fcb30ea2f6b62c0f72867794f02e34057a5
parent939e2fe270553ac4675520adeaf23761e856c468 (diff)
downloadpoky-144e7b461d36469e95c8c8c209c53c1cf5c888d0.tar.gz
udev: Don't install unused links.conf file (thanks Joe Sauer for spotting)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/recipes-core/udev/udev-new.inc2
-rw-r--r--meta/recipes-core/udev/udev_145.bb4
-rw-r--r--meta/recipes-core/udev/udev_158.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
index 87f9633473..1a9f202045 100644
--- a/meta/recipes-core/udev/udev-new.inc
+++ b/meta/recipes-core/udev/udev-new.inc
@@ -71,7 +71,7 @@ do_install_append () {
71 #install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules 71 #install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
72 #install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules 72 #install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules
73 #install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules 73 #install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
74 install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf 74 #install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf
75 #if [ "${UDEV_DEVFS_RULES}" = "1" ]; then 75 #if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
76 # install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules 76 # install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
77 #fi 77 #fi
diff --git a/meta/recipes-core/udev/udev_145.bb b/meta/recipes-core/udev/udev_145.bb
index 91d8ce3734..75a7572b3f 100644
--- a/meta/recipes-core/udev/udev_145.bb
+++ b/meta/recipes-core/udev/udev_145.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
3the hotplug package and requires a kernel not older than 2.6.12." 3the hotplug package and requires a kernel not older than 2.6.12."
4RPROVIDES_${PN} = "hotplug" 4RPROVIDES_${PN} = "hotplug"
5 5
6PR = "r9" 6PR = "r10"
7 7
8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ 8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
9 file://enable-gudev.patch;patch=1 \ 9 file://enable-gudev.patch;patch=1 \
@@ -41,7 +41,7 @@ do_install () {
41 #install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules 41 #install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
42 #install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules 42 #install -m 0644 ${WORKDIR}/run.rules ${D}${sysconfdir}/udev/rules.d/run.rules
43 #install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules 43 #install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
44 install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf 44 #install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf
45 #if [ "${UDEV_DEVFS_RULES}" = "1" ]; then 45 #if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
46 # install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules 46 # install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
47 #fi 47 #fi
diff --git a/meta/recipes-core/udev/udev_158.bb b/meta/recipes-core/udev/udev_158.bb
index a9529d9d86..c4eedb7f31 100644
--- a/meta/recipes-core/udev/udev_158.bb
+++ b/meta/recipes-core/udev/udev_158.bb
@@ -1,3 +1,3 @@
1include udev-new.inc 1include udev-new.inc
2 2
3PR = "r3" 3PR = "r4"