From: Etienne Champetier Date: Thu, 31 Oct 2019 10:54:59 +0000 (-0700) Subject: build: fixup python SetupHostCommand to use python2 X-Git-Tag: v18.06.6~58 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dfd8c3bfdccfde7b84735aafd7b2c69cc4d9b087;p=oweals%2Fopenwrt.git 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 (cherry picked from commit 785d4f3efded4a5094ee8e1ce4535dd0933b956d) --- diff --git a/include/prereq-build.mk b/include/prereq-build.mk index f7da916f64..209392b720 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))