diff options
Diffstat (limited to 'poky/meta/classes/kernel-module-split.bbclass')
| -rw-r--r-- | poky/meta/classes/kernel-module-split.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/poky/meta/classes/kernel-module-split.bbclass b/poky/meta/classes/kernel-module-split.bbclass index 67ab4161d..e8d3eb510 100644 --- a/poky/meta/classes/kernel-module-split.bbclass +++ b/poky/meta/classes/kernel-module-split.bbclass @@ -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]) @@ -132,7 +133,7 @@ python split_kernel_module_packages () { kernel_package_name = d.getVar("KERNEL_PACKAGE_NAME") or "kernel" kernel_version = d.getVar("KERNEL_VERSION") - module_regex = '^(.*)\.k?o$' + module_regex = r'^(.*)\.k?o$' module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX') module_pattern_suffix = d.getVar('KERNEL_MODULE_PACKAGE_SUFFIX') |