mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

boot/uboot: drop host-python2 support

Browse Source 
host-python2 is gone, so drop the _NEEDS_PYTHON2 logic.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2022-02-11 09:17:26 +01:00
parent 1fc1b258d3
commit ea6a0a60e2
3 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2022.02" comment "Legacy options removed in 2022.02"
config BR2_TARGET_UBOOT_NEEDS_PYTHON2
bool "host-python 2.7 support for U-Boot was removed"
select BR2_LEGACY
help
Option was removed together with python 2.7 support.
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
bool "gst1-plugins-bad plugin libmms was removed" bool "gst1-plugins-bad plugin libmms was removed"
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR

28
boot/uboot/Config.in
View File

@@ -143,45 +143,23 @@ config BR2_TARGET_UBOOT_NEEDS_DTC
Select this option if your U-Boot board configuration Select this option if your U-Boot board configuration
requires the Device Tree compiler to be available. requires the Device Tree compiler to be available.
config BR2_TARGET_UBOOT_NEEDS_PYTHON
bool
choice
bool "U-Boot needs host Python"
config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE
bool "no"
depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON
help
Select this option if U-Boot does not need any
host python to build.
config BR2_TARGET_UBOOT_NEEDS_PYTHON2
bool "python 2.x"
help
Select this option if U-Boot needs a host Python 2.x
interpreter. This is the case for some U-Boot
configurations, prior to U-Boot 2020.01.
config BR2_TARGET_UBOOT_NEEDS_PYTHON3 config BR2_TARGET_UBOOT_NEEDS_PYTHON3
bool "python 3.x" bool "U-Boot needs host python 3.x"
help help
Select this option if U-Boot needs a host Python 3.x Select this option if U-Boot needs a host Python 3.x
interpreter. This is the case for some U-Boot interpreter. This is the case for some U-Boot
configurations, after U-Boot 2020.01. configurations, after U-Boot 2020.01.
endchoice
config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT
bool "U-Boot needs pylibfdt" bool "U-Boot needs pylibfdt"
select BR2_TARGET_UBOOT_NEEDS_PYTHON select BR2_TARGET_UBOOT_NEEDS_PYTHON3
help help
Select this option if your U-Boot board configuration Select this option if your U-Boot board configuration
requires the Python libfdt library to be available. requires the Python libfdt library to be available.
config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS
bool "U-Boot needs pyelftools" bool "U-Boot needs pyelftools"
select BR2_TARGET_UBOOT_NEEDS_PYTHON select BR2_TARGET_UBOOT_NEEDS_PYTHON3
help help
Select this option if your U-Boot board configuration Select this option if your U-Boot board configuration
requires the Python pyelftools library to be available. requires the Python pyelftools library to be available.

8
boot/uboot/uboot.mk
View File

@@ -207,9 +207,7 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
UBOOT_DEPENDENCIES += host-dtc UBOOT_DEPENDENCIES += host-dtc
endif endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
UBOOT_DEPENDENCIES += host-python host-python-setuptools
else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools
endif endif
@@ -218,12 +216,8 @@ UBOOT_DEPENDENCIES += host-swig
endif endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y)
ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y)
UBOOT_DEPENDENCIES += host-python-pyelftools
else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
UBOOT_DEPENDENCIES += host-python3-pyelftools UBOOT_DEPENDENCIES += host-python3-pyelftools
endif endif
endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y)
UBOOT_DEPENDENCIES += host-openssl UBOOT_DEPENDENCIES += host-openssl