kernel-module-split.bbclass: Fix modinfo decoding in old kernels

PATCH New [email protected] 1 participant 1 message Dec 31, 2018

lore

Share & tools

lore

[email protected]

author

2018-12-31 00:05 UTC #0 lore raw

PATCH v2 1/1 kernel-module-split.bbclass: Fix modinfo decoding in old kernels

From: Pau Espin Pedrol <[email protected]>

Before linux commit d36b691077dc59c74efec0d54ed21b86f7a2a21a, some strings contained invalid utf-8 character which made split_kernel_module_packages unhappy when parsing ums-isd200.ko:

Exception: UnicodeDecodeError: 'utf-8' codec can't decode byte 0xf6 in position 21: invalid start byte

Signed-off-by Pau Espin Pedrol <[email protected]>

---
 meta/classes/kernel-module-split.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

meta/classes/kernel-module-split.bbclass +2 -1

index 67ab4161da..e8996cf59b 100644
@@ -48,7 +48,8 @@ python split_kernel_module_packages () {
         tmpfile = tf[1]
         cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile)
         subprocess.check_call(cmd, shell=True)
-        f = open(tmpfile)
+        # errors='replace': Some old kernel versions contain invalid utf-8 characters in mod descriptions (like 0xf6, 'ö')
+        f = open(tmpfile, errors='replace')
         l = f.read().split("\000")
         f.close()
         os.close(tf[0])

Signature · 1 line

2.20.1