diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-03-20 09:52:58 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2019-07-26 08:09:16 +0200 |
| commit | 3b68fb57c938af3948ae4c2da61501183fbef649 (patch) | |
| tree | 80b7edef9aa1cf1d443edc05739301ba99f39faa | |
| parent | 19938c8de7a062626796f53a2805608c0dd4edbd (diff) | |
| download | upstream-3b68fb57c938af3948ae4c2da61501183fbef649.tar.gz upstream-3b68fb57c938af3948ae4c2da61501183fbef649.tar.bz2 upstream-3b68fb57c938af3948ae4c2da61501183fbef649.zip | |
build: cleanup possibly dangling Python 2 host symlink
When bumping buildroot to Python 3, we need to assure, that Python
symlink in staging bin directory points to Python >= 3.5 as well.
We can't rely completly just on SetupHostCommand as its executed only in
cases when the $(STAGING_DIR_HOST)/bin/python doesn't already exist, so
we need to remove it before running SetupHostCommand.
Acked-by: Yousong Zhou <yszhou4tech@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
| -rw-r--r-- | include/prereq-build.mk | 2 | ||||
| -rw-r--r-- | include/prereq.mk | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk index c52ca71908..40df89575d 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -141,6 +141,8 @@ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \ $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \ perl --version | grep "perl.*v5")) +$(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]\.?', \ diff --git a/include/prereq.mk b/include/prereq.mk index 0f0f253744..83ac21242c 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -66,6 +66,18 @@ define RequireHeader $$(eval $$(call Require,$(1),$(2))) endef +define CleanupPython2 + define Require/python2-cleanup + if [ -f "$(STAGING_DIR_HOST)/bin/python" ] && \ + $(STAGING_DIR_HOST)/bin/python -V 2>&1 | \ + grep -q 'Python 2'; then \ + rm $(STAGING_DIR_HOST)/bin/python; \ + fi + endef + + $$(eval $$(call Require,python2-cleanup)) +endef + define QuoteHostCommand '$(subst ','"'"',$(strip $(1)))' endef |