diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/base.bbclass | 6 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index df11c8b270..57b69492ce 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -128,6 +128,12 @@ def setup_hosttools_dir(dest, toolsvar, d, fatal=True): os.symlink(srctool, desttool) else: notfound.append(tool) + # Force "python" -> "python2" + desttool = os.path.join(dest, "python") + if not os.path.exists(desttool): + srctool = "python2" + os.symlink(srctool, desttool) + if notfound and fatal: bb.fatal("The following required tools (as specified by HOSTTOOLS) appear to be unavailable in PATH, please install them in order to proceed:\n %s" % " ".join(notfound)) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 93aee1ae46..dcf2007883 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -476,12 +476,13 @@ export PATH HOSTTOOLS_DIR = "${TMPDIR}/hosttools" # Tools needed to run builds with OE-Core +# python is special cased to point at python2 HOSTTOOLS += " \ [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ - mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python python2 \ + mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python2 \ python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ |