diff options
Diffstat (limited to 'meta/classes/kernel-module-split.bbclass')
| -rw-r--r-- | meta/classes/kernel-module-split.bbclass | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass index 9a95b72744..ed42d2b19d 100644 --- a/meta/classes/kernel-module-split.bbclass +++ b/meta/classes/kernel-module-split.bbclass @@ -30,6 +30,8 @@ PACKAGESPLITFUNCS_prepend = "split_kernel_module_packages " KERNEL_MODULES_META_PACKAGE ?= "kernel-modules" +KERNEL_MODULE_PACKAGE_PREFIX ?= "" + python split_kernel_module_packages () { import re @@ -70,12 +72,12 @@ python split_kernel_module_packages () { m = kerverrexp.match(kernelver) if m: kernelver_stripped = m.group(1) - staging_kernel_dir = d.getVar("STAGING_KERNEL_DIR", True) + staging_kernel_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True) system_map_file = "%s/boot/System.map-%s" % (dvar, kernelver) if not os.path.exists(system_map_file): system_map_file = "%s/System.map-%s" % (staging_kernel_dir, kernelver) if not os.path.exists(system_map_file): - bb.fatal("System.map-%s does not exist in '%s/boot' nor STAGING_KERNEL_DIR '%s'" % (kernelver, dvar, staging_kernel_dir)) + bb.fatal("System.map-%s does not exist in '%s/boot' nor STAGING_KERNEL_BUILDDIR '%s'" % (kernelver, dvar, staging_kernel_dir)) cmd = "depmod -n -a -b %s -F %s %s" % (dvar, system_map_file, kernelver_stripped) f = os.popen(cmd, 'r') @@ -148,7 +150,7 @@ python split_kernel_module_packages () { postinst = d.getVar('pkg_postinst_%s' % pkg, True) if not postinst: bb.fatal("pkg_postinst_%s not defined" % pkg) - postinst += d.getVar('autoload_postinst_fragment', True) % autoload + postinst += d.getVar('autoload_postinst_fragment', True) % (autoload or basename) d.setVar('pkg_postinst_%s' % pkg, postinst) # Write out any modconf fragment @@ -176,9 +178,14 @@ python split_kernel_module_packages () { rdepends[dep] = [] d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) + # Avoid automatic -dev recommendations for modules ending with -dev. + d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1) + module_deps = parse_depmod() module_regex = '^(.*)\.k?o$' - module_pattern = 'kernel-module-%s' + + module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX', True) + module_pattern = module_pattern_prefix + 'kernel-module-%s' postinst = d.getVar('pkg_postinst_modules', True) postrm = d.getVar('pkg_postrm_modules', True) |