diff options
| author | Martin Hundebøll <mnhu@prevas.dk> | 2017-09-11 14:28:36 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-12 16:53:31 +0100 |
| commit | c315b1e036b1252f35abda921c49327c950a9570 (patch) | |
| tree | 6cb748680ccbfbd56cbb6988ec224888cc8bff8d | |
| parent | 1b0943925783f948fbb1f30ffd2f287c97f4f354 (diff) | |
| download | openembedded-core-c315b1e036b1252f35abda921c49327c950a9570.tar.gz openembedded-core-c315b1e036b1252f35abda921c49327c950a9570.tar.bz2 openembedded-core-c315b1e036b1252f35abda921c49327c950a9570.zip | |
Revert "kernel-module-split: rrecommend kernel-image instead of rdepend"
This reverts commit e0ed52c51464855e9a6a37ea49df7efde7e91076.
Commit e0ed52c514 ('kernel-module-split: rrecommend kernel-image instead
of rdepend') changed kernel modules to rrecommend kernel-image instead
of rdepend on kernel. This broke existing setups, where the kernel is
omitted by setting RDEPEND_kernel-base = "".
Revert the patch, as the existing way of omitting kernel-image in images
works just fine.
Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/kernel-module-split.bbclass | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass index 78843c5474..1035525dac 100644 --- a/meta/classes/kernel-module-split.bbclass +++ b/meta/classes/kernel-module-split.bbclass @@ -120,11 +120,6 @@ python split_kernel_module_packages () { rdepends[dep] = [] d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) - # let kernel modules runtime recommend kernel image - rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "") - rrecommends['kernel-image'] = [] - d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False)) - # Avoid automatic -dev recommendations for modules ending with -dev. d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1) @@ -143,7 +138,7 @@ python split_kernel_module_packages () { postinst = d.getVar('pkg_postinst_modules') postrm = d.getVar('pkg_postrm_modules') - modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='') + modules = do_split_packages(d, root='${nonarch_base_libdir}/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"))) if modules: metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) |