diff options
| author | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-13 15:28:42 +0000 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-13 15:28:42 +0000 |
| commit | fe379ffc9b1b75ba62a68f5bc21b854e5da49259 (patch) | |
| tree | 312e1b5003b9ef65e718b145052d447f2f8e2653 /classes/kernel.bbclass | |
| parent | 8a2fba6940e3e07bc7613a431c99a6b7ed433588 (diff) | |
| parent | f4a7dac492fabd4f30dcad003cdcabdf6684e39e (diff) | |
merge of 'ad95f08d419bba954eab21c0d4ef155b70f86dbc'
and 'eeb3a83ad8d45d4069e1ae9170eb852a6bb31d43'
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)) |