summaryrefslogtreecommitdiffstats
path: root/scripts/lib/recipetool/create_kernel.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-29 15:12:03 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 09:57:24 +0100
commit75f1a0ed422669734081f394187c28ef0258dfc2 (patch)
treedbb026543f557ec3c391d41fc03be9b72196dbe7 /scripts/lib/recipetool/create_kernel.py
parent74c5cd0c2c98c0fb80c834b514afacb598ad7073 (diff)
downloadpoky-75f1a0ed422669734081f394187c28ef0258dfc2.tar.gz
recipetool: create: avoid decoding errors with Python 3
We're opening source files with the default encoding (utf-8) but we can't necessarily be sure that they are UTF-8 clean - for example, recipetool create ftp://mama.indstate.edu/linux/tree/tree-1.7.0.tgz prior to this patch resulted in a UnicodeDecodeError. Use the "surrogateescape" mode to avoid this. Fixes [YOCTO #9822]. (From OE-Core rev: 50fcd9d1b9a20d49bc873467a82a071f2f2f8b5a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/recipetool/create_kernel.py')
-rw-r--r--scripts/lib/recipetool/create_kernel.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create_kernel.py b/scripts/lib/recipetool/create_kernel.py
index c6e86bd2b9..7dac59fd03 100644
--- a/scripts/lib/recipetool/create_kernel.py
+++ b/scripts/lib/recipetool/create_kernel.py
@@ -59,7 +59,7 @@ class KernelRecipeHandler(RecipeHandler):
59 kpatchlevel = -1 59 kpatchlevel = -1
60 ksublevel = -1 60 ksublevel = -1
61 kextraversion = '' 61 kextraversion = ''
62 with open(makefile, 'r') as f: 62 with open(makefile, 'r', errors='surrogateescape') as f:
63 for i, line in enumerate(f): 63 for i, line in enumerate(f):
64 if i > 10: 64 if i > 10:
65 break 65 break