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-09 10:21:51 +0000 |
| commit | 2b2be8086e66c0017eba57cac042466208b51583 (patch) | |
| tree | eaa162fdb7d71a2de7224fc9f75c3643812065cf /meta | |
| parent | ed884c585f90dfc352041c258802cf90d73914f2 (diff) | |
| download | poky-2b2be8086e66c0017eba57cac042466208b51583.tar.gz | |
hosttools: no longer check for or provide host python 2 to builds
(From OE-Core rev: 5f8f16b17f66966ae91aeabc23e97de5ecd17447)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/base.bbclass | 5 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 5 |
2 files changed, 2 insertions, 8 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): | |||
| 138 | os.symlink(srctool, desttool) | 138 | os.symlink(srctool, desttool) |
| 139 | else: | 139 | else: |
| 140 | notfound.append(tool) | 140 | notfound.append(tool) |
| 141 | # Force "python" -> "python2" | ||
| 142 | desttool = os.path.join(dest, "python") | ||
| 143 | if not os.path.exists(desttool): | ||
| 144 | srctool = "python2" | ||
| 145 | os.symlink(srctool, desttool) | ||
| 146 | 141 | ||
| 147 | if notfound and fatal: | 142 | if notfound and fatal: |
| 148 | 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)) | 143 | 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 | |||
| 481 | HOSTTOOLS_DIR = "${TMPDIR}/hosttools" | 481 | HOSTTOOLS_DIR = "${TMPDIR}/hosttools" |
| 482 | 482 | ||
| 483 | # Tools needed to run builds with OE-Core | 483 | # Tools needed to run builds with OE-Core |
| 484 | # python is special cased to point at python2 | ||
| 485 | HOSTTOOLS += " \ | 484 | HOSTTOOLS += " \ |
| 486 | [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ | 485 | [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ |
| 487 | cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ | 486 | cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ |
| 488 | fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ | 487 | fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ |
| 489 | head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ | 488 | head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ |
| 490 | mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python2 \ | 489 | mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd \ |
| 491 | python2.7 python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ | 490 | python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ |
| 492 | sleep sort split stat strings strip tail tar tee test touch tr true uname \ | 491 | sleep sort split stat strings strip tail tar tee test touch tr true uname \ |
| 493 | uniq wc wget which xargs \ | 492 | uniq wc wget which xargs \ |
| 494 | " | 493 | " |
