From 306839586bbff4b026aae7fee5a8d551f223f63f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 9 Feb 2022 17:50:28 +0100 Subject: [PATCH] package/python: drop target package Python 2.7 is EOL since April 2020, so drop support for the target package. https://www.python.org/dev/peps/pep-0373/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Config.in.legacy | 8 +++ package/Config.in | 3 +- package/python/Config.in | 139 --------------------------------------- 3 files changed, 9 insertions(+), 141 deletions(-) delete mode 100644 package/python/Config.in diff --git a/Config.in.legacy b/Config.in.legacy index 34d8c71cc8..6bc3803a5c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_PYTHON + bool "python2.7 package removed" + select BR2_LEGACY + help + Python 2.7 is EOL since April 2020 and has been removed. + + https://www.python.org/dev/peps/pep-0373/ + config BR2_TARGET_UBOOT_ZYNQ_IMAGE bool "Generate image for Xilinx Zynq" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d631ed784a..ca2fb363e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -897,9 +897,8 @@ if BR2_STATIC_LIBS comment "External PHP extensions need a toolchain w/ dynamic library" endif endif - source "package/python/Config.in" source "package/python3/Config.in" -if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 +if BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aenum/Config.in" source "package/python-aexpect/Config.in" diff --git a/package/python/Config.in b/package/python/Config.in deleted file mode 100644 index ab6950cae8..0000000000 --- a/package/python/Config.in +++ /dev/null @@ -1,139 +0,0 @@ -comment "python needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON - bool "python2.7 (deprecated)" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -if BR2_PACKAGE_PYTHON - -choice - prompt "python module format to install" - default BR2_PACKAGE_PYTHON_PYC_ONLY - help - Select Python module format to install on target (py, pyc or - both) - -config BR2_PACKAGE_PYTHON_PY_ONLY - bool ".py sources only" - -config BR2_PACKAGE_PYTHON_PYC_ONLY - bool ".pyc compiled sources only" - -config BR2_PACKAGE_PYTHON_PY_PYC - bool ".py sources and .pyc compiled" - -endchoice - -menu "core python modules" - -comment "The following modules are unusual or require extra libraries" - -config BR2_PACKAGE_PYTHON_2TO3 - bool "2to3 module" - help - code translation from python 2 to 3 - -config BR2_PACKAGE_PYTHON_BZIP2 - bool "bzip2 module" - select BR2_PACKAGE_BZIP2 - help - bzip2 module for Python - -config BR2_PACKAGE_PYTHON_BSDDB - bool "bsddb module" - select BR2_PACKAGE_BERKELEYDB - help - bsddb module for Python. - -config BR2_PACKAGE_PYTHON_CODECSCJK - bool "codecscjk module" - help - Chinese/Japanese/Korean codecs module for Python (large). - -config BR2_PACKAGE_PYTHON_CURSES - bool "curses module" - select BR2_PACKAGE_NCURSES - help - curses module for Python. - -config BR2_PACKAGE_PYTHON_OSSAUDIODEV - bool "ossaudiodev module" - help - ossaudiodev module for Python. - -config BR2_PACKAGE_PYTHON_READLINE - bool "readline" - select BR2_PACKAGE_READLINE - help - readline module for Python (required for command-line - editing in the Python shell). - -config BR2_PACKAGE_PYTHON_SSL - bool "ssl" - select BR2_PACKAGE_OPENSSL - help - _ssl module for Python (required for https in urllib etc). - -config BR2_PACKAGE_PYTHON_UNICODEDATA - bool "unicodedata module" - default y - help - Unicode character database (used by stringprep module) - (large). - -if BR2_PACKAGE_PYTHON_UNICODEDATA - -choice - prompt "Python unicode database format" - default BR2_PACKAGE_PYTHON_UCS2 - help - Select Python unicode database format for target - -config BR2_PACKAGE_PYTHON_UCS2 - bool "Universal Character Set 2-byte (UCS2)" - -config BR2_PACKAGE_PYTHON_UCS4 - bool "Universal Character Set 4-byte (UCS4)" - -endchoice - -endif - -config BR2_PACKAGE_PYTHON_SQLITE - bool "sqlite module" - select BR2_PACKAGE_SQLITE - help - SQLite database support - -config BR2_PACKAGE_PYTHON_PYEXPAT - bool "xml module" - select BR2_PACKAGE_EXPAT - help - pyexpat and xml libraries for Python - -config BR2_PACKAGE_PYTHON_ZLIB - bool "zlib module" - select BR2_PACKAGE_ZLIB - help - zlib support in Python - -config BR2_PACKAGE_PYTHON_HASHLIB - bool "hashlib module" - select BR2_PACKAGE_OPENSSL - help - hashlib support in Python - -endmenu - -endif