From c315b1e036b1252f35abda921c49327c950a9570 Mon Sep 17 00:00:00 2001 From: Martin Hundebøll Date: Mon, 11 Sep 2017 14:28:36 +0200 Subject: Revert "kernel-module-split: rrecommend kernel-image instead of rdepend" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie --- meta/classes/kernel-module-split.bbclass | 7 +------ 1 file changed, 1 insertion(+), 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)) -- cgit 1.2.3-korg