From cdf878387ad460f7c6b7a58dcc996918bcd07a0a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 21 Apr 2011 14:32:45 +0100 Subject: Remove machine-specific metadata for machines no longer in oe-core (From OE-Core rev: 72567733033347b662d9baa07432985fd2da3efa) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-core/udev/files/50-hostap_cs.rules | 4 ---- meta/recipes-core/udev/files/akita/mount.blacklist | 3 --- meta/recipes-core/udev/files/c7x0/mount.blacklist | 3 --- meta/recipes-core/udev/files/spitz/mount.blacklist | 4 ---- meta/recipes-core/udev/files/tosa/mount.blacklist | 3 --- meta/recipes-core/udev/udev-new.inc | 7 ------- meta/recipes-core/udev/udev_145.bb | 9 +-------- meta/recipes-core/udev/udev_164.bb | 2 +- 8 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-core/udev/files/50-hostap_cs.rules delete mode 100644 meta/recipes-core/udev/files/akita/mount.blacklist delete mode 100644 meta/recipes-core/udev/files/c7x0/mount.blacklist delete mode 100644 meta/recipes-core/udev/files/spitz/mount.blacklist delete mode 100644 meta/recipes-core/udev/files/tosa/mount.blacklist (limited to 'meta/recipes-core/udev') diff --git a/meta/recipes-core/udev/files/50-hostap_cs.rules b/meta/recipes-core/udev/files/50-hostap_cs.rules deleted file mode 100644 index efefdc58fc..0000000000 --- a/meta/recipes-core/udev/files/50-hostap_cs.rules +++ /dev/null @@ -1,4 +0,0 @@ -# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards -# -ACTION=="add", DEVICE=="hostap_cs", \ - SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1" diff --git a/meta/recipes-core/udev/files/akita/mount.blacklist b/meta/recipes-core/udev/files/akita/mount.blacklist deleted file mode 100644 index c15b582298..0000000000 --- a/meta/recipes-core/udev/files/akita/mount.blacklist +++ /dev/null @@ -1,3 +0,0 @@ -/dev/mtdblock -/dev/loop -/dev/ram diff --git a/meta/recipes-core/udev/files/c7x0/mount.blacklist b/meta/recipes-core/udev/files/c7x0/mount.blacklist deleted file mode 100644 index c15b582298..0000000000 --- a/meta/recipes-core/udev/files/c7x0/mount.blacklist +++ /dev/null @@ -1,3 +0,0 @@ -/dev/mtdblock -/dev/loop -/dev/ram diff --git a/meta/recipes-core/udev/files/spitz/mount.blacklist b/meta/recipes-core/udev/files/spitz/mount.blacklist deleted file mode 100644 index aee308f9b8..0000000000 --- a/meta/recipes-core/udev/files/spitz/mount.blacklist +++ /dev/null @@ -1,4 +0,0 @@ -/dev/mtdblock -/dev/hda -/dev/loop -/dev/ram diff --git a/meta/recipes-core/udev/files/tosa/mount.blacklist b/meta/recipes-core/udev/files/tosa/mount.blacklist deleted file mode 100644 index c15b582298..0000000000 --- a/meta/recipes-core/udev/files/tosa/mount.blacklist +++ /dev/null @@ -1,3 +0,0 @@ -/dev/mtdblock -/dev/loop -/dev/ram diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc index 4faaae1b8d..d1abf39074 100644 --- a/meta/recipes-core/udev/udev-new.inc +++ b/meta/recipes-core/udev/udev-new.inc @@ -27,8 +27,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://udev-cache \ file://init" -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " - inherit autotools pkgconfig update-rc.d # udevd/udevadm -> /sbin/, libudev.so.* -> /lib/ @@ -39,7 +37,6 @@ EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \ PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg" PACKAGES =+ "libgudev libgudev-dev libgudev-dbg" -PACKAGE_ARCH_h2200 = "h2200" INITSCRIPT_PACKAGES = "udev udev-cache" INITSCRIPT_NAME_udev = "udev" @@ -86,7 +83,3 @@ 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 } - -do_install_append_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} diff --git a/meta/recipes-core/udev/udev_145.bb b/meta/recipes-core/udev/udev_145.bb index fde5050b5b..becef04706 100644 --- a/meta/recipes-core/udev/udev_145.bb +++ b/meta/recipes-core/udev/udev_145.bb @@ -1,15 +1,12 @@ RPROVIDES_${PN} = "hotplug" -PR = "r10" +PR = "r11" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://enable-gudev.patch;patch=1 \ file://run.rules \ " -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - require udev.inc INITSCRIPT_PARAMS = "start 03 S ." @@ -56,7 +53,3 @@ do_install () { install -d ${D}${base_libdir}/udev/ } -do_install_append_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} - diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb index 135685f2b8..76fd907ef7 100644 --- a/meta/recipes-core/udev/udev_164.bb +++ b/meta/recipes-core/udev/udev_164.bb @@ -1,6 +1,6 @@ include udev-new.inc -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f" SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c" -- cgit v1.2.3-54-g00ecf