yoctoproject/poky-contrib
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky-contrib synced 2025-05-08 23:52:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

kernel-module-split: Allow for external conf files

Browse Source 
Some recipes might provide conf files produced during build phase or
simply tracked in the VCS instead of generating them with Yocto.
In such cases those conf files wouldn't be assigned to correct packages.
With this change, if user wants to generate a conf file they still can,
but not generating them won't prevent assigning the file to proper
package given the file exists.

(From OE-Core rev: 0e1379109478d879cbbc5fb1454328a4b9a04215)

Signed-off-by: Michal Sieron <michalwsieron@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
This commit is contained in:
Michal Sieron 2025-04-29 15:20:36 +02:00 committed by Mathieu Dubois-Briand
parent c87f20b5c1
commit 9e12b61b55
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta/classes-recipe/kernel-module-split.bbclass
View File

@ -99,9 +99,12 @@ python split_kernel_module_packages () {
bb.warn("module_autoload_%s was replaced by KERNEL_MODULE_AUTOLOAD for cases where basename == module name, please drop it" % basename) bb.warn("module_autoload_%s was replaced by KERNEL_MODULE_AUTOLOAD for cases where basename == module name, please drop it" % basename)
if autoload and basename not in autoloadlist: if autoload and basename not in autoloadlist:
bb.warn("module_autoload_%s is defined but '%s' isn't included in KERNEL_MODULE_AUTOLOAD, please add it there" % (basename, basename)) bb.warn("module_autoload_%s is defined but '%s' isn't included in KERNEL_MODULE_AUTOLOAD, please add it there" % (basename, basename))
# The .conf file can either be installed by a recipe or generated from module_autoload_*
conf = '%s/%s.conf' % (d.getVar('modulesloaddir'), basename)
name = '%s%s' % (dvar, conf)
# If module name is in KERNEL_MODULE_AUTOLOAD, then generate the .conf file and write to `name`.
if basename in autoloadlist: if basename in autoloadlist:
conf = '%s/%s.conf' % (d.getVar('modulesloaddir'), basename)
name = '%s%s' % (dvar, conf)
os.makedirs(os.path.dirname(name), exist_ok=True) os.makedirs(os.path.dirname(name), exist_ok=True)
with open(name, 'w') as f: with open(name, 'w') as f:
if autoload: if autoload:
@ -109,6 +112,9 @@ python split_kernel_module_packages () {
f.write('%s\n' % m) f.write('%s\n' % m)
else: else:
f.write('%s\n' % basename) f.write('%s\n' % basename)
# If the .conf file exits, then add it to FILES:* and CONFFILES:* and add postinstall hook.
# It doesn't matter if it was generated from module_autoload_* or installed by the recipe.
if os.path.exists(name):
conf2append = ' %s' % conf conf2append = ' %s' % conf
d.appendVar('FILES:%s' % pkg, conf2append) d.appendVar('FILES:%s' % pkg, conf2append)
d.appendVar('CONFFILES:%s' % pkg, conf2append) d.appendVar('CONFFILES:%s' % pkg, conf2append)
@ -121,19 +127,24 @@ python split_kernel_module_packages () {
# Write out any modconf fragment # Write out any modconf fragment
modconflist = (d.getVar("KERNEL_MODULE_PROBECONF") or "").split() modconflist = (d.getVar("KERNEL_MODULE_PROBECONF") or "").split()
modconf = d.getVar('module_conf_%s' % basename) modconf = d.getVar('module_conf_%s' % basename)
# The .conf file can either be installed by a recipe or generated from module_conf_*
conf = '%s/%s.conf' % (d.getVar('modprobedir'), basename)
name = '%s%s' % (dvar, conf)
# If module name is in KERNEL_MODULE_PROBECONF, then generate the .conf file and write to `name`.
if modconf and basename in modconflist: if modconf and basename in modconflist:
conf = '%s/%s.conf' % (d.getVar('modprobedir'), basename)
name = '%s%s' % (dvar, conf)
os.makedirs(os.path.dirname(name), exist_ok=True) os.makedirs(os.path.dirname(name), exist_ok=True)
with open(name, 'w') as f: with open(name, 'w') as f:
f.write("%s\n" % modconf) f.write("%s\n" % modconf)
elif modconf:
bb.error("Please ensure module %s is listed in KERNEL_MODULE_PROBECONF since module_conf_%s is set" % (basename, basename))
# If the .conf file exits, then add it to FILES:* and CONFFILES:*.
# It doesn't matter if it was generated from module_conf_* or installed by the recipe.
if os.path.exists(name):
conf2append = ' %s' % conf conf2append = ' %s' % conf
d.appendVar('FILES:%s' % pkg, conf2append) d.appendVar('FILES:%s' % pkg, conf2append)
d.appendVar('CONFFILES:%s' % pkg, conf2append) d.appendVar('CONFFILES:%s' % pkg, conf2append)
elif modconf:
bb.error("Please ensure module %s is listed in KERNEL_MODULE_PROBECONF since module_conf_%s is set" % (basename, basename))
if "description" in vals: if "description" in vals:
old_desc = d.getVar('DESCRIPTION:' + pkg) or "" old_desc = d.getVar('DESCRIPTION:' + pkg) or ""
d.setVar('DESCRIPTION:' + pkg, old_desc + "; " + vals["description"]) d.setVar('DESCRIPTION:' + pkg, old_desc + "; " + vals["description"])