diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-30 11:18:54 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-07 23:08:55 +0000 |
commit | 8929ffd67c6de431c2561f63c5427df6c354d30f (patch) | |
tree | d3a67f1032c39b8fbbebb2f176908ca8dca45fd1 /meta | |
parent | fcf55f58ae73b4e54ea853c816c0fef0f33ca46c (diff) | |
download | poky-8929ffd67c6de431c2561f63c5427df6c354d30f.tar.gz |
oe-init-buildenv/base: Relax python version checks in favour of HOSTTOOLS manipulation
Several distros are now shipping "python" as python v3 contra to the original
python guidelines. This causes users confusion/pain in trying to use our tools.
We can just force "python" to "python2" within HOSTTOOLS to avoid this issue
and hide the complexity from the user.
(From OE-Core rev: b06a6cde5c5503f456f260c773cf126085e18c8d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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): | |||
128 | os.symlink(srctool, desttool) | 128 | os.symlink(srctool, desttool) |
129 | else: | 129 | else: |
130 | notfound.append(tool) | 130 | notfound.append(tool) |
131 | # Force "python" -> "python2" | ||
132 | desttool = os.path.join(dest, "python") | ||
133 | if not os.path.exists(desttool): | ||
134 | srctool = "python2" | ||
135 | os.symlink(srctool, desttool) | ||
136 | |||
131 | if notfound and fatal: | 137 | if notfound and fatal: |
132 | 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)) | 138 | 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)) |
133 | 139 | ||
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 | |||
476 | HOSTTOOLS_DIR = "${TMPDIR}/hosttools" | 476 | HOSTTOOLS_DIR = "${TMPDIR}/hosttools" |
477 | 477 | ||
478 | # Tools needed to run builds with OE-Core | 478 | # Tools needed to run builds with OE-Core |
479 | # python is special cased to point at python2 | ||
479 | HOSTTOOLS += " \ | 480 | HOSTTOOLS += " \ |
480 | [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ | 481 | [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ |
481 | cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ | 482 | cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ |
482 | fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ | 483 | fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ |
483 | head hostname id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ | 484 | head hostname id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ |
484 | mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python python2 \ | 485 | mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python2 \ |
485 | python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh sha256sum \ | 486 | python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh sha256sum \ |
486 | sleep sort split stat strings strip tail tar tee test touch tr true uname \ | 487 | sleep sort split stat strings strip tail tar tee test touch tr true uname \ |
487 | uniq wc wget which xargs \ | 488 | uniq wc wget which xargs \ |