aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEtienne Champetier <champetier.etienne@gmail.com>2019-10-31 03:54:59 -0700
committerPetr Štetiar <ynezz@true.cz>2019-11-09 08:21:45 +0100
commit785d4f3efded4a5094ee8e1ce4535dd0933b956d (patch)
tree402cacdf9b7ccda78a02ee3b50abca5c027c1f65 /include
parent502c4a81d3886a64201c24ae0a954357006c75e0 (diff)
downloadupstream-785d4f3efded4a5094ee8e1ce4535dd0933b956d.tar.gz
upstream-785d4f3efded4a5094ee8e1ce4535dd0933b956d.tar.bz2
upstream-785d4f3efded4a5094ee8e1ce4535dd0933b956d.zip
build: fixup python SetupHostCommand to use python2
Here is a way to break your build env without this patch: 1) have python point to python3, and no python2 2) start the build, SetupHostCommand will create a symlink ./staging_dir/host/bin/python -> /usr/bin/python 3) build fails on scons because it can't find any python2 4) install python2 and restart the build 5) the build fails on wireless-regdb compile because python is python3 instead of python Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/prereq-build.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index cbfc62397e..8d9140a2d2 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -142,9 +142,9 @@ $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
perl --version | grep "perl.*v5"))
$(eval $(call SetupHostCommand,python,Please install Python 2.x, \
- python2.7 -V 2>&1 | grep Python, \
- python2 -V 2>&1 | grep Python, \
- python -V 2>&1 | grep Python))
+ python2.7 -V 2>&1 | grep 'Python 2.7', \
+ python2 -V 2>&1 | grep 'Python 2', \
+ python -V 2>&1 | grep 'Python 2'))
$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule))