aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-12-03 17:51:37 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-12-06 09:52:15 +0100
commitc456d2927f7b6adb642c1d47dcca5aab23d342a4 (patch)
tree5ba818332da8636d009db467bf28df1ac2754b53
parent7779481b12ff2bfe7243a42629c111e2392ad0db (diff)
downloadbuildroot-c456d2927f7b6adb642c1d47dcca5aab23d342a4.tar.gz
buildroot-c456d2927f7b6adb642c1d47dcca5aab23d342a4.tar.bz2
utils/genrandconfig: fix runtime issue with Python 3
With Python 3.7, genrandconfig fails with: 'str' object has no attribute 'decode' We are already working on str objects, and there is no need to decode them, so we drop the call to decode_byte_list() and its definition as it was only used there. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (cherry picked from commit 5cfe5d789796919d815c5707928bd5f4febad3bf) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rwxr-xr-xutils/genrandconfig10
1 files changed, 1 insertions, 9 deletions
diff --git a/utils/genrandconfig b/utils/genrandconfig
index d6b7fd56b7..2293dc0f35 100755
--- a/utils/genrandconfig
+++ b/utils/genrandconfig
@@ -39,14 +39,6 @@ def urlopen_closing(uri):
return contextlib.closing(_urllib.urlopen(uri))
-if sys.hexversion >= 0x3000000:
- def decode_byte_list(bl):
- return [b.decode() for b in bl]
-else:
- def decode_byte_list(e):
- return e
-
-
class SystemInfo:
DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"]
DEFAULT_OPTIONAL_PROGS = ["bzr", "java", "javac", "jar", "diffoscope"]
@@ -128,7 +120,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir):
with open(toolchains_csv) as r:
# filter empty lines and comments
lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#']
- toolchains = decode_byte_list(lines)
+ toolchains = lines
configs = []
(_, _, _, _, hostarch) = os.uname()