summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-module-split.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/kernel-module-split.bbclass')
-rw-r--r--meta/classes/kernel-module-split.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 1035525dac..78843c5474 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -120,6 +120,11 @@ 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
123 # Avoid automatic -dev recommendations for modules ending with -dev. 128 # Avoid automatic -dev recommendations for modules ending with -dev.
124 d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1) 129 d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
125 130
@@ -138,7 +143,7 @@ python split_kernel_module_packages () {
138 postinst = d.getVar('pkg_postinst_modules') 143 postinst = d.getVar('pkg_postinst_modules')
139 postrm = d.getVar('pkg_postrm_modules') 144 postrm = d.getVar('pkg_postrm_modules')
140 145
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"))) 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='')
142 if modules: 147 if modules:
143 metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') 148 metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
144 d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) 149 d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))