summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorTzu Hsiang Lin <t9360341@ntut.org.tw>2018-05-22 01:56:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:46 +0100
commit719d068bde55ef29a3468bc0779d4cb0c11e8c1d (patch)
tree2c6c3ff11532a16d310cbd57aa5621df8014bff3 /bitbake
parent3b0e1e22753065ff18c55d84349538fba808fff0 (diff)
downloadpoky-719d068bde55ef29a3468bc0779d4cb0c11e8c1d.tar.gz
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 <command>". (Bitbake rev: bd9a1b063633af2936ba1dd87b19202424900151) Signed-off-by: Tzu Hsiang Lin <t9360341@ntut.org.tw> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/clearcase.py3
-rw-r--r--bitbake/lib/bb/fetch2/npm.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/clearcase.py b/bitbake/lib/bb/fetch2/clearcase.py
index 36beab6a5b..3a6573d0b2 100644
--- a/bitbake/lib/bb/fetch2/clearcase.py
+++ b/bitbake/lib/bb/fetch2/clearcase.py
@@ -69,7 +69,6 @@ from bb.fetch2 import FetchMethod
69from bb.fetch2 import FetchError 69from bb.fetch2 import FetchError
70from bb.fetch2 import runfetchcmd 70from bb.fetch2 import runfetchcmd
71from bb.fetch2 import logger 71from bb.fetch2 import logger
72from distutils import spawn
73 72
74class ClearCase(FetchMethod): 73class ClearCase(FetchMethod):
75 """Class to fetch urls via 'clearcase'""" 74 """Class to fetch urls via 'clearcase'"""
@@ -107,7 +106,7 @@ class ClearCase(FetchMethod):
107 else: 106 else:
108 ud.module = "" 107 ud.module = ""
109 108
110 ud.basecmd = d.getVar("FETCHCMD_ccrc") or spawn.find_executable("cleartool") or spawn.find_executable("rcleartool") 109 ud.basecmd = d.getVar("FETCHCMD_ccrc") or "/usr/bin/env cleartool || rcleartool"
111 110
112 if d.getVar("SRCREV") == "INVALID": 111 if d.getVar("SRCREV") == "INVALID":
113 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.") 112 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 730c346a93..408dfc3d03 100644
--- a/bitbake/lib/bb/fetch2/npm.py
+++ b/bitbake/lib/bb/fetch2/npm.py
@@ -32,7 +32,6 @@ from bb.fetch2 import runfetchcmd
32from bb.fetch2 import logger 32from bb.fetch2 import logger
33from bb.fetch2 import UnpackError 33from bb.fetch2 import UnpackError
34from bb.fetch2 import ParameterError 34from bb.fetch2 import ParameterError
35from distutils import spawn
36 35
37def subprocess_setup(): 36def subprocess_setup():
38 # Python installs a SIGPIPE handler by default. This is usually not what 37 # Python installs a SIGPIPE handler by default. This is usually not what