diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-11 09:42:16 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-11 09:42:16 +0000 |
| commit | 7bcf4828673040af5022534981de6416f5884cff (patch) | |
| tree | 18ab00a9b6f1ce29fa7b613662e256785fb59781 /classes/kernel.bbclass | |
| parent | 84b2b31930881004a73267cf24fe6fe701e0f8a8 (diff) | |
| parent | 78c32ad25a3883dc7a127a36673890225f9f54f2 (diff) | |
propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)
to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)
Diffstat (limited to 'classes/kernel.bbclass')
| -rw-r--r-- | classes/kernel.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 5976f42c71..c00d0f3f58 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -349,6 +349,9 @@ python populate_packages_prepend () { # If autoloading is requested, output /etc/modutils/<name> and append # appropriate modprobe commands to the postinst autoload = bb.data.getVar('module_autoload_%s' % basename, d, 1) + if not autoload: + # Also, try canonical name with dashes + autoload = bb.data.getVar('module_autoload_%s' % basename.replace('_', '-'), d, 1) if autoload: name = '%s/etc/modutils/%s' % (dvar, basename) f = open(name, 'w') @@ -400,7 +403,7 @@ python populate_packages_prepend () { metapkg = "kernel-modules" bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) bb.data.setVar('FILES_' + metapkg, "", d) - blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base' ] + blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ] for l in module_deps.values(): for i in l: pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1)) |