From b06a6cde5c5503f456f260c773cf126085e18c8d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 Oct 2018 11:18:54 +0000 Subject: 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. Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/classes/base.bbclass') 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)) -- cgit 1.2.3-korg