summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2025-10-01 11:34:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-10-06 17:01:10 +0100
commit4cd06c8979d27e9e86f949d8935a93fe659ba8e9 (patch)
treec102a10e8a7d30953cf6f889ee5bda660238d5ce
parentbe67d3a00ade848e97e8b7f383fed7e3bfa0d26c (diff)
downloadpoky-4cd06c8979d27e9e86f949d8935a93fe659ba8e9.tar.gz
kernel-module-split.bbclass: support muti-lines in module conf
The expanded bitbake variables are raw strings so it does not support writting multiple lines to a kernel module conf, add the support by decoding it with 'unicode-escape'. Reported-by: Mathias Thore <mathias.thore@atlascopco.com> (From OE-Core rev: 48e12557c12c05a6b211d52bc87ee1a30f3be83f) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes-recipe/kernel-module-split.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass
index 75ed696b72..c289808404 100644
--- a/meta/classes-recipe/kernel-module-split.bbclass
+++ b/meta/classes-recipe/kernel-module-split.bbclass
@@ -131,7 +131,7 @@ python split_kernel_module_packages () {
131 if modconf and basename in modconflist: 131 if modconf and basename in modconflist:
132 os.makedirs(os.path.dirname(name), exist_ok=True) 132 os.makedirs(os.path.dirname(name), exist_ok=True)
133 with open(name, 'w') as f: 133 with open(name, 'w') as f:
134 f.write("%s\n" % modconf) 134 f.write("%s\n" % modconf.encode().decode('unicode-escape'))
135 elif modconf: 135 elif modconf:
136 bb.error("Please ensure module %s is listed in KERNEL_MODULE_PROBECONF since module_conf_%s is set" % (basename, basename)) 136 bb.error("Please ensure module %s is listed in KERNEL_MODULE_PROBECONF since module_conf_%s is set" % (basename, basename))
137 # If the .conf file exits, then add it to FILES:* and CONFFILES:*. 137 # If the .conf file exits, then add it to FILES:* and CONFFILES:*.