From d533711030536990cd87940c5ddc18fecb521c95 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 7 Dec 2007 19:44:09 +0000 Subject: kernel.bbclass: Add kernel-vmlinux to kernel-modules dependency blacklist. * This cuts x11-gpe-image by 3M for example. --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 5976f42c71..a1f165c73a 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -400,7 +400,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)) -- cgit v1.2.3 From 8457558134eea81f2274f4464b0984b5307a492b Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 7 Dec 2007 20:44:19 +0000 Subject: kernel.bbclass: When processing module_autoload's, also try canonical name (with dashes). * To remind, modprobe accepts both '-' & '_' in module names interchangeably. Actual module files use both. Still, in OE, some consistency is needed. And its natural to use dash as the separator, as package names already use that. So, if canonical naming is used, it all will "just work", refardless of what separator chars specific kernel module filename randomly contains. --- classes/kernel.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index a1f165c73a..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/ 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') -- cgit v1.2.3