build: Switch to Python3

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index e0d3b31464aedc84faca05ca45792e853c36ff20..48af310c57a4217e9662658c2d77e36d1f41d502 100644 (file)
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -127,12 +127,14 @@ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \
 $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
        perl --version | grep "perl.*v5"))
 
-$(eval $(call CleanupPython3))
-
-$(eval $(call SetupHostCommand,python,Please install Python 2.x, \
-       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 CleanupPython2))
+
+$(eval $(call SetupHostCommand,python,Please install Python >= 3.5, \
+       python3.8 -V 2>&1 | grep 'Python 3', \
+       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, \
        git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule))

diff --git a/include/prereq.mk b/include/prereq.mk
index 60f1e47c3db61d9d271ddaa3e5766e1ec757320d..83ac21242c6535b9bdd03e70b2b91f10161231e5 100644 (file)
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -66,16 +66,16 @@ define RequireHeader
   $$(eval $$(call Require,$(1),$(2)))
 endef
 
-define CleanupPython3
-  define Require/python3-cleanup
+define CleanupPython2
+  define Require/python2-cleanup
        if [ -f "$(STAGING_DIR_HOST)/bin/python" ] && \
                $(STAGING_DIR_HOST)/bin/python -V 2>&1 | \
-               grep -q 'Python 3'; then \
+               grep -q 'Python 2'; then \
                        rm $(STAGING_DIR_HOST)/bin/python; \
        fi
   endef
 
-  $$(eval $$(call Require,python3-cleanup))
+  $$(eval $$(call Require,python2-cleanup))
 endef
 
 define QuoteHostCommand