udev 171: readd modprobe rule to main recipe

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 20 insertions, 2 deletions

diff --git a/meta-oe/recipes-core/udev/udev/modprobe.rules b/meta-oe/recipes-core/udev/udev/modprobe.rules
new file mode 100644
index 000000000..d4a096b82
--- /dev/null
+++ b/meta-oe/recipes-core/udev/udev/modprobe.rules
@@ -0,0 +1,17 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
diff --git a/meta-oe/recipes-core/udev/udev_171.bb b/meta-oe/recipes-core/udev/udev_171.bb
index f9a31af55..0311c3c68 100644
--- a/meta-oe/recipes-core/udev/udev_171.bb
+++ b/meta-oe/recipes-core/udev/udev_171.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 DEPENDS = "gperf-native usbutils acl glib-2.0"
 
 SRCREV = "${PV}"
-PR = "r2"
+PR = "r3"
 
 # version specific SRC_URI
 SRC_URI = "git://git.kernel.org/pub/scm/linux/hotplug/udev.git;protocol=git \
@@ -29,6 +29,7 @@ SRC_URI[sha256sum] = "1d5c548d7c85d30b3508b82ad88d853e28dddb6c526d0e67aa92ac18af
 # generic SRC_URI
 SRC_URI += " \
        file://touchscreen.rules \
+       file://modprobe.rules \
        file://default \
        file://init \
        file://cache \
@@ -97,7 +98,7 @@ do_install () {
         install -d ${D}${sysconfdir}/default
         install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
 
-        install -m 0644 ${WORKDIR}/touchscreen.rules         ${D}${sysconfdir}/udev/rules.d/touchscreen.rules
+        install -m 0644 ${WORKDIR}/*.rules         ${D}${sysconfdir}/udev/rules.d/
 
         touch ${D}${sysconfdir}/udev/saved.uname
         touch ${D}${sysconfdir}/udev/saved.cmdline