From ccbb13fb661af127a6b2e3cc3d5fc44e84aa7dfe Mon Sep 17 00:00:00 2001 From: Tzu Hsiang Lin Date: Thu, 26 Jul 2018 00:26:50 +0000 Subject: bitbake: fetch2: fix import error for Python 3.6.5 When running bitbake command with Python 3.6.5 always result in import error causing by the change of distutils module. This patch replaces the method to search executable in PATH by "/usr/bin/env ". (Bitbake rev: 0193e1f5b2128602ad8a80c82a3dd4d2cdb6e4a7) Signed-off-by: Tzu Hsiang Lin Signed-off-by: Richard Purdie Signed-off-by: Changhyeok Bae Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/clearcase.py | 3 +-- bitbake/lib/bb/fetch2/npm.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bitbake/lib/bb/fetch2/clearcase.py b/bitbake/lib/bb/fetch2/clearcase.py index 70e280a8dd..41cd46fe25 100644 --- a/bitbake/lib/bb/fetch2/clearcase.py +++ b/bitbake/lib/bb/fetch2/clearcase.py @@ -70,7 +70,6 @@ from bb.fetch2 import FetchMethod from bb.fetch2 import FetchError from bb.fetch2 import runfetchcmd from bb.fetch2 import logger -from distutils import spawn class ClearCase(FetchMethod): """Class to fetch urls via 'clearcase'""" @@ -108,7 +107,7 @@ class ClearCase(FetchMethod): else: ud.module = "" - ud.basecmd = d.getVar("FETCHCMD_ccrc", True) or spawn.find_executable("cleartool") or spawn.find_executable("rcleartool") + ud.basecmd = d.getVar("FETCHCMD_ccrc", True) or "/usr/bin/env cleartool || rcleartool" if data.getVar("SRCREV", d, True) == "INVALID": raise FetchError("Set a valid SRCREV for the clearcase fetcher in your recipe, e.g. SRCREV = \"/main/LATEST\" or any other label of your choice.") diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py index 699ae72e05..7ccaba9873 100644 --- a/bitbake/lib/bb/fetch2/npm.py +++ b/bitbake/lib/bb/fetch2/npm.py @@ -33,7 +33,6 @@ from bb.fetch2 import runfetchcmd from bb.fetch2 import logger from bb.fetch2 import UnpackError from bb.fetch2 import ParameterError -from distutils import spawn def subprocess_setup(): # Python installs a SIGPIPE handler by default. This is usually not what -- cgit v1.2.3-54-g00ecf