diff options
-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 () { | |||
120 | rdepends[dep] = [] | 120 | rdepends[dep] = [] |
121 | d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) | 121 | d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) |
122 | 122 | ||
123 | # let kernel modules runtime recommend kernel image | ||
124 | rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "") | ||
125 | rrecommends['kernel-image'] = [] | ||
126 | d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False)) | ||
127 | |||
128 | # Avoid automatic -dev recommendations for modules ending with -dev. | 123 | # Avoid automatic -dev recommendations for modules ending with -dev. |
129 | d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1) | 124 | d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1) |
130 | 125 | ||
@@ -143,7 +138,7 @@ python split_kernel_module_packages () { | |||
143 | postinst = d.getVar('pkg_postinst_modules') | 138 | postinst = d.getVar('pkg_postinst_modules') |
144 | postrm = d.getVar('pkg_postrm_modules') | 139 | postrm = d.getVar('pkg_postrm_modules') |
145 | 140 | ||
146 | 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='') | 141 | 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"))) |
147 | if modules: | 142 | if modules: |
148 | metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') | 143 | metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') |
149 | d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) | 144 | d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) |