From c001ace8bdf03fec036840638a1fa2a1edd8b2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 14 Nov 2019 16:50:18 +0100 Subject: [PATCH] build: prereq: simplify Python 3 version checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't need to check if python3.5 binary is actually Python 3.5+. Signed-off-by: Petr Štetiar --- include/prereq-build.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 4c599100563..d73f0040c35 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -144,15 +144,15 @@ $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \ $(eval $(call CleanupPython2)) $(eval $(call SetupHostCommand,python,Please install Python >= 3.5, \ - python3.7 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ - python3.6 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ - python3.5 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ + python3.7 -V 2>&1 | grep 'Python 3', \ + python3.6 -V 2>&1 | grep 'Python 3', \ + python3.5 -V 2>&1 | grep 'Python 3', \ python3 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?')) $(eval $(call SetupHostCommand,python3,Please install Python >= 3.5, \ - python3.7 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ - python3.6 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ - python3.5 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?', \ + python3.7 -V 2>&1 | grep 'Python 3', \ + python3.6 -V 2>&1 | grep 'Python 3', \ + python3.5 -V 2>&1 | grep 'Python 3', \ python3 -V 2>&1 | grep -E 'Python 3\.[5-9]\.?')) $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \