diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-18 10:39:39 +0100 |
|---|---|---|
| committer |   Andreas Oberritter <obi@opendreambox.org> | 2015-02-23 17:15:40 +0100 |
| commit | 87d842a2248d33446c4ed387120d463c48e6e783 (patch) | |
| tree | 545c81c9d999cb3449da798657b1ba40d9319dc6 /meta/classes | |
| parent | 5d7b66b9ef9ff005f47eeed8562e83e74ab8eb0d (diff) | |
| download | openembedded-core-contrib-87d842a2248d33446c4ed387120d463c48e6e783.tar.gz | |
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: <module>
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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f30d12b4fbfe7d6b581598efa9ceca69dcfb4294)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/kernel-module-split.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
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: |