diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:11:05 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:11:05 +0300 |
| commit | a75bff085ba9443315222231c42692745e5781e9 (patch) | |
| tree | e1aa422babae0dffc866af076a0274ff26c2c4b2 /poky/meta/classes/kernel-module-split.bbclass | |
| parent | 3e809d0d5cf96c18c5720d1b6b3b53e9f4c0cfae (diff) | |
| parent | 6d4bcf0a75b2a6055055c9ad8ed6b93599082385 (diff) | |
| download | openbmc-a75bff085ba9443315222231c42692745e5781e9.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
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') |