summaryrefslogtreecommitdiff
path: root/classes/kernel.bbclass
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-07-25 09:56:17 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-07-25 09:56:17 +0000
commit0990e13e269d897ce9939e9bf1280c50d3f333e8 (patch)
tree0fb2b85741c1f3e12f1cee365cda9183613bd856 /classes/kernel.bbclass
parentecdb76f70743961f7a1c7c5adfff6566530dec58 (diff)
kernel.bbclass: Add support for module config per 2.6 conevntions.
* 2.6 modprobe expects per-module configuration in /etc/modprobe.d/ . * Closes #2669.
Diffstat (limited to 'classes/kernel.bbclass')
-rw-r--r--classes/kernel.bbclass12
1 files changed, 9 insertions, 3 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 658bbbf675..0670da678d 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -143,7 +143,10 @@ kernel_do_install() {
install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
install -d ${D}/etc/modutils
-
+ if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then
+ install -d ${D}/etc/modprobe.d
+ fi
+
# Check if scripts/genksyms exists and if so, build it
if [ -e scripts/genksyms/ ]; then
oe_runmake SUBDIRS="scripts/genksyms"
@@ -345,13 +348,16 @@ python populate_packages_prepend () {
# Write out any modconf fragment
modconf = bb.data.getVar('module_conf_%s' % basename, d, 1)
if modconf:
- name = '%s/etc/modutils/%s.conf' % (dvar, basename)
+ if bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) == "2.6":
+ name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
+ else:
+ name = '%s/etc/modutils/%s.conf' % (dvar, basename)
f = open(name, 'w')
f.write("%s\n" % modconf)
f.close()
files = bb.data.getVar('FILES_%s' % pkg, d, 1)
- files = "%s /etc/modutils/%s /etc/modutils/%s.conf" % (files, basename, basename)
+ files = "%s /etc/modutils/%s /etc/modutils/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename, basename)
bb.data.setVar('FILES_%s' % pkg, files, d)
if vals.has_key("description"):