summaryrefslogtreecommitdiffstats
path: root/poky/bitbake
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-06-14 09:52:03 -0700
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-08-27 20:22:11 -0400
commitd5ae7d902a40f26a8c26f4c6d300226689738716 (patch)
tree85c711404990dd5e37447cd7492c3017815790b7 /poky/bitbake
parent0639c5b2c542e0ed9465cc9d8e5100ac0063038f (diff)
downloadtalos-openbmc-d5ae7d902a40f26a8c26f4c6d300226689738716.tar.gz
talos-openbmc-d5ae7d902a40f26a8c26f4c6d300226689738716.zip
Sumo refresh
Update external subtrees to latest Yocto sumo. Change-Id: I8364f32bef079841c6e57f1c587f4b1bedf62fef Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/bitbake')
-rw-r--r--poky/bitbake/lib/bb/fetch2/clearcase.py3
-rw-r--r--poky/bitbake/lib/bb/fetch2/npm.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/poky/bitbake/lib/bb/fetch2/clearcase.py b/poky/bitbake/lib/bb/fetch2/clearcase.py
index 36beab6a5..3a6573d0b 100644
--- a/poky/bitbake/lib/bb/fetch2/clearcase.py
+++ b/poky/bitbake/lib/bb/fetch2/clearcase.py
@@ -69,7 +69,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'"""
@@ -107,7 +106,7 @@ class ClearCase(FetchMethod):
else:
ud.module = ""
- ud.basecmd = d.getVar("FETCHCMD_ccrc") or spawn.find_executable("cleartool") or spawn.find_executable("rcleartool")
+ ud.basecmd = d.getVar("FETCHCMD_ccrc") or "/usr/bin/env cleartool || rcleartool"
if d.getVar("SRCREV") == "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/poky/bitbake/lib/bb/fetch2/npm.py b/poky/bitbake/lib/bb/fetch2/npm.py
index 730c346a9..408dfc3d0 100644
--- a/poky/bitbake/lib/bb/fetch2/npm.py
+++ b/poky/bitbake/lib/bb/fetch2/npm.py
@@ -32,7 +32,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
OpenPOWER on IntegriCloud