summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-30 11:18:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-07 23:08:55 +0000
commit8929ffd67c6de431c2561f63c5427df6c354d30f (patch)
treed3a67f1032c39b8fbbebb2f176908ca8dca45fd1 /meta/conf
parentfcf55f58ae73b4e54ea853c816c0fef0f33ca46c (diff)
downloadpoky-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/conf')
-rw-r--r--meta/conf/bitbake.conf3
1 files changed, 2 insertions, 1 deletions
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
476HOSTTOOLS_DIR = "${TMPDIR}/hosttools" 476HOSTTOOLS_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
479HOSTTOOLS += " \ 480HOSTTOOLS += " \
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 \