Remove duplicate udev firmware loading rule

[vuplus_openembedded] / recipes / udev / udev_124.bb

diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb
old mode 100644 (file)
new mode 100755 (executable)
index 37dc3a7..a582847
--- a/recipes/udev/udev_124.bb
+++ b/recipes/udev/udev_124.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
-PR = "r15"
+PR = "r23"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
           file://noasmlinkage.patch;patch=1 \
@@ -10,16 +10,37 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
           file://vol_id_ld.patch;patch=1 \
           file://udevtrigger_add_devname_filtering.patch;patch=1 \
           file://libvolume-id-soname.patch;patch=1 \
+          file://mtd-exclude-persistent.patch;patch=1 \
           file://mount.blacklist \
           file://run.rules \
+          file://default \
+          file://local.rules \
           "
 
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
 PACKAGE_ARCH_h2200 = "h2200"
 
+SRC_URI_append_opendreambox = " file://40-od-devfs-compatibility.rules \
+          file://42-od-oled-compatibility.rules"
+
+SRC_URI_append_dm8000 = " ${@base_contains('PREFERRED_VERSION_linux-dm8000', '2.6.18', 'file://41-od-linux-2.6.18-misc.rules', '', d)}"
+SRC_URI_append_dm800 = " ${@base_contains('PREFERRED_VERSION_linux-dm800', '2.6.18', 'file://41-od-linux-2.6.18-misc.rules', '', d)}"
+SRC_URI_append_dm800se = " ${@base_contains('PREFERRED_VERSION_linux-dm800se', '2.6.18', 'file://41-od-linux-2.6.18-misc.rules', '', d)}"
+SRC_URI_append_dm7020hd = " ${@base_contains('PREFERRED_VERSION_linux-dm7020hd', '2.6.18', 'file://41-od-linux-2.6.18-misc.rules', '', d)}"
+SRC_URI_append_dm500hd = " ${@base_contains('PREFERRED_VERSION_linux-dm500hd', '2.6.18', 'file://41-od-linux-2.6.18-misc.rules', '', d)}"
+
+SRC_URI_append_vuplus = " file://40-od-devfs-compatibility.rules \
+          file://42-od-oled-compatibility.rules"
+
+SRC_URI_append_bm750 = " file://41-od-linux-2.6.18-misc.rules"
+SRC_URI_append_vusolo = " file://41-od-linux-2.6.18-misc.rules"
+SRC_URI_append_vuuno = " file://41-od-linux-2.6.18-misc.rules"
+SRC_URI_append_vuultimo = " file://41-od-linux-2.6.18-misc.rules"
+
+
 require udev.inc
 
-INITSCRIPT_PARAMS = "start 03 S ."
+INITSCRIPT_PARAMS = "start 04 S ."
 
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
@@ -33,6 +54,9 @@ do_install () {
        install -d ${D}${sysconfdir}/init.d
        install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
 
+       install -d ${D}${sysconfdir}/default
+       install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
+
        install -d ${D}${sysconfdir}/udev/rules.d/
 
        install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
@@ -45,6 +69,10 @@ do_install () {
                install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
        fi
 
+       touch ${D}${sysconfdir}/udev/saved.uname
+       touch ${D}${sysconfdir}/udev/saved.cmdline
+       touch ${D}${sysconfdir}/udev/saved.atags
+
        install -d ${D}${sysconfdir}/udev/scripts/
 
        install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
@@ -56,3 +84,13 @@ do_install () {
 do_install_append_h2200() {
        install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
 }
+
+do_install_append_opendreambox() {
+       install -m 0644 ${WORKDIR}/??-od-*.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+do_install_append_vuplus() {
+       install -m 0644 ${WORKDIR}/??-od-*.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+