prereq-build: remove python 2 cleanup recipe
authorMichael Pratt <mcpratt@pm.me>
Tue, 16 May 2023 07:22:09 +0000 (03:22 -0400)
committerPetr Štetiar <ynezz@true.cz>
Sun, 21 May 2023 17:39:35 +0000 (19:39 +0200)
This reverts commit 3b68fb57c938af3948ae4c2da61501183fbef649.

After refactoring build checks to update old symlinks,
and after a long time of no python 2 support,
this is no longer needed.

Signed-off-by: Michael Pratt <mcpratt@pm.me>
include/prereq-build.mk
include/prereq.mk

index 14a221088050f53dd11127d1101a485d148bfe09..52988fbda927170510bfbe5a060227f9be85c4f6 100644 (file)
@@ -175,8 +175,6 @@ $(eval $(call SetupHostCommand,install,Please install GNU 'install', \
 $(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.6, \
        python3.11 -V 2>&1 | grep 'Python 3', \
        python3.10 -V 2>&1 | grep 'Python 3', \
index 89660d323d9b82858ffda8498255522ed84b7aaa..5646b24efaa61a1f8b2c066901f192ea65508730 100644 (file)
@@ -77,18 +77,6 @@ define RequireCHeader
   $$(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