summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-03-23 20:55:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-24 12:33:37 +0000
commitc106bb61f56ab276d94a48f5a5cdc55d8e12d56a (patch)
tree1d612d2f823a08db909a6b5763c900961979b2c6
parentb6b9f7ae638a0cc04aa7237ff30c0920581d6154 (diff)
downloadpoky-c106bb61f56ab276d94a48f5a5cdc55d8e12d56a.tar.gz
kernel.bbclass: blacklist 'kernel-misc' from kernel-modules
When 'kernel-misc' is empty do_rootfs will fail when including 'kernel-modules' The proper fix would be to have a whitelist for the 'kernel-modules' meta-pkg (From OE-Core rev: bb72bd56101698b7fe166dd02fdca07d06a6eb8b) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Tested-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3eb6659a75..9f014d4953 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -429,7 +429,7 @@ python populate_packages_prepend () {
429 metapkg = "kernel-modules" 429 metapkg = "kernel-modules"
430 bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) 430 bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
431 bb.data.setVar('FILES_' + metapkg, "", d) 431 bb.data.setVar('FILES_' + metapkg, "", d)
432 blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf' ] 432 blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'kernel-misc' ]
433 for l in module_deps.values(): 433 for l in module_deps.values():
434 for i in l: 434 for i in l:
435 pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1)) 435 pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))