From dae258afc85431169ff17f0a50061fc3a3ef6526 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 Jun 2014 10:39:39 +0100 Subject: kernel-module-split: Fix KERNEL_MODULE_AUTOLOAD handling Addresses the problem: The stack trace of python calls that resulted in this exception/failure was: File: 'split_kernel_module_packages', lineno: 164, function: 0160: if len(os.listdir(dir)) == 0: 0161: os.rmdir(dir) 0162: 0163: *** 0164:split_kernel_module_packages(d) 0165: File: 'split_kernel_module_packages', lineno: 150, function: split_kernel_module_packages 0146: 0147: postinst = d.getVar('pkg_postinst_modules', True) 0148: postrm = d.getVar('pkg_postrm_modules', True) 0149: *** 0150: modules = do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION", True))) 0151: if modules: 0152: metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE', True) 0153: d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) 0154: File: 'package.bbclass', lineno: 148, function: do_split_packages 0144: d.setVar('pkg_postrm_' + pkg, postrm) 0145: else: 0146: d.setVar('FILES_' + pkg, oldfiles + " " + newfile) 0147: if callable(hook): *** 0148: hook(f, pkg, file_regex, output_pattern, m.group(1)) 0149: 0150: d.setVar('PACKAGES', ' '.join(packages)) 0151: return split_packages 0152: File: 'split_kernel_module_packages', lineno: 109, function: frob_metadata File "split_kernel_module_packages", line 109, in frob_metadata Exception: AttributeError: 'NoneType' object has no attribute 'split' ERROR: Function failed: split_kernel_module_packages [YOCTO #6461] [a revised version of a patch from Nitin Kamble] (From OE-Core rev: f30d12b4fbfe7d6b581598efa9ceca69dcfb4294) Signed-off-by: Richard Purdie --- meta/classes/kernel-module-split.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass index e38a6f6e7e..0c045c91e9 100644 --- a/meta/classes/kernel-module-split.bbclass +++ b/meta/classes/kernel-module-split.bbclass @@ -137,8 +137,7 @@ python split_kernel_module_packages () { if basename in autoloadlist: name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename) f = open(name, 'w') - for m in autoload.split(): - f.write('%s\n' % m) + f.write('%s\n' % basename) f.close() postinst = d.getVar('pkg_postinst_%s' % pkg, True) if not postinst: -- cgit v1.2.3-54-g00ecf