diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2019-11-25 18:22:23 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-06 14:41:30 +0000 |
| commit | 5f8f16b17f66966ae91aeabc23e97de5ecd17447 (patch) | |
| tree | 6a262a743fddfb4be164c98b2c17acd74756d664 | |
| parent | d40853b10dd9f01d6a8dd4edcb941cfa8a544922 (diff) | |
| download | openembedded-core-contrib-5f8f16b17f66966ae91aeabc23e97de5ecd17447.tar.gz | |
hosttools: no longer check for or provide host python 2 to builds
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 5 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 5 | ||||
| -rwxr-xr-x | scripts/oe-buildenv-internal | 7 |
3 files changed, 2 insertions, 15 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 3306b316bb..31457f9f12 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -138,11 +138,6 @@ 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 263d8aea4f..e75bbcece0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -481,14 +481,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 iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ - mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python2 \ - python2.7 python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ + mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd \ + python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ " diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 96bb0c3dc9..c17cf4da71 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -29,13 +29,6 @@ if [ -z "$OE_SKIP_SDK_CHECK" ] && [ -n "$OECORE_SDK_VERSION" ]; then return 1 fi -py_v27_check=$(python2 -c 'import sys; print sys.version_info >= (2,7,3)') -if [ "$py_v27_check" != "True" ]; then - echo >&2 "OpenEmbedded requires 'python' to be python v2 (>= 2.7.3), not python v3." - echo >&2 "Please upgrade your python v2." -fi -unset py_v27_check - # We potentially have code that doesn't parse correctly with older versions # of Python, and rather than fixing that and being eternally vigilant for # any other new feature use, just check the version here. |