mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 15:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "kernel-module-split: rrecommend kernel-image instead of rdepend"

Browse Source 
This reverts commit e0ed52c514.

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.

(From OE-Core rev: c315b1e036b1252f35abda921c49327c950a9570)

Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Hundebøll
2017-09-11 14:28:36 +02:00
committed by Richard Purdie
parent 4e1d33772d
commit c9daf6b38b
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meta/classes/kernel-module-split.bbclass
View File

@@ -120,11 +120,6 @@ python split_kernel_module_packages () {
rdepends[dep] = [] rdepends[dep] = []
d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) 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. # Avoid automatic -dev recommendations for modules ending with -dev.
d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1) d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
@@ -143,7 +138,7 @@ python split_kernel_module_packages () {
postinst = d.getVar('pkg_postinst_modules') postinst = d.getVar('pkg_postinst_modules')
postrm = d.getVar('pkg_postrm_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: if modules:
metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))