diff options
Diffstat (limited to 'poky/meta/classes/kernel-module-split.bbclass')
| -rw-r--r-- | poky/meta/classes/kernel-module-split.bbclass | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/poky/meta/classes/kernel-module-split.bbclass b/poky/meta/classes/kernel-module-split.bbclass index b56dd4a9c..a29c29481 100644 --- a/poky/meta/classes/kernel-module-split.bbclass +++ b/poky/meta/classes/kernel-module-split.bbclass @@ -28,6 +28,7 @@ do_install:append() { install -d ${D}${sysconfdir}/modules-load.d/ ${D}${sysconfdir}/modprobe.d/ } +KERNEL_SPLIT_MODULES ?= "1" PACKAGESPLITFUNCS:prepend = "split_kernel_module_packages " KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or "kernel" }-modules" @@ -44,17 +45,20 @@ python split_kernel_module_packages () { def extract_modinfo(file): import tempfile, subprocess tempfile.tempdir = d.getVar("WORKDIR") - compressed = re.match( r'.*\.([xg])z$', file) + compressed = re.match( r'.*\.(gz|xz|zst)$', file) tf = tempfile.mkstemp() tmpfile = tf[1] if compressed: tmpkofile = tmpfile + ".ko" - if compressed.group(1) == 'g': + if compressed.group(1) == 'gz': cmd = "gunzip -dc %s > %s" % (file, tmpkofile) subprocess.check_call(cmd, shell=True) - elif compressed.group(1) == 'x': + elif compressed.group(1) == 'xz': cmd = "xz -dc %s > %s" % (file, tmpkofile) subprocess.check_call(cmd, shell=True) + elif compressed.group(1) == 'zst': + cmd = "zstd -dc %s > %s" % (file, tmpkofile) + subprocess.check_call(cmd, shell=True) else: msg = "Cannot decompress '%s'" % file raise msg @@ -153,18 +157,26 @@ python split_kernel_module_packages () { kernel_package_name = d.getVar("KERNEL_PACKAGE_NAME") or "kernel" kernel_version = d.getVar("KERNEL_VERSION") - module_regex = r'^(.*)\.k?o(?:\.[xg]z)?$' + metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') + splitmods = d.getVar('KERNEL_SPLIT_MODULES') + postinst = d.getVar('pkg_postinst:modules') + postrm = d.getVar('pkg_postrm:modules') + + if splitmods != '1': + etcdir = d.getVar('sysconfdir') + d.appendVar('FILES:' + metapkg, '%s/modules-load.d/ %s/modprobe.d/ %s/modules/' % (etcdir, etcdir, d.getVar("nonarch_base_libdir"))) + d.appendVar('pkg_postinst:%s' % metapkg, postinst) + d.prependVar('pkg_postrm:%s' % metapkg, postrm); + return + + module_regex = r'^(.*)\.k?o(?:\.(gz|xz|zst))?$' module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX') module_pattern_suffix = d.getVar('KERNEL_MODULE_PACKAGE_SUFFIX') module_pattern = module_pattern_prefix + kernel_package_name + '-module-%s' + module_pattern_suffix - 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='%s-%s' % (kernel_package_name, kernel_version)) if modules: - metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') d.appendVar('RDEPENDS:' + metapkg, ' '+' '.join(modules)) # If modules-load.d and modprobe.d are empty at this point, remove them to |