diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-25 09:57:29 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-25 09:57:29 +0000 |
| commit | 9b7d152e6fd914b95c6559f16e0f302df2d70da5 (patch) | |
| tree | a8ed042ab21e07563dec3dba81868686c2f7f189 /classes | |
| parent | 5961a7fd3b224f587d8a4eaac3ef7fd2fdb25cc9 (diff) | |
| parent | 0990e13e269d897ce9939e9bf1280c50d3f333e8 (diff) | |
merge of '402c34c0b6d4b1612568766c052d7a182cdfdea8'
and 'c01beefb52676bc5ec31fd4ea03ad3352556b919'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 12 |
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"): |