Drop python 2.7

deleted file mode 100644
index 8579745cc8..0000000000
@@ -1,6 +0,0 @@
-import subprocess32
-
-output = subprocess32.check_output(["ls", "-l", "/dev/null"])
-print(output)
-assert("/dev/null" in output)
-assert("No such" not in output)

index baa23154f8..a179027633 100644
@@ -45,14 +45,6 @@ class TestBmapTools(BRTest):
         self.assertRunOk(cmd, timeout=20)
 
 
-class TestPy2BmapTools(TestBmapTools):
-    __test__ = True
-    config = TestBmapTools.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        """
-
-
 class TestPy3BmapTools(TestBmapTools):
     __test__ = True
     config = TestBmapTools.config + \

index e320d3207e..470a714eb6 100644
@@ -33,14 +33,6 @@ class TestCrudiniBase(TestPythonPackageBase):
         self.assertEqual(out, ['this-is-the-magic-value'])
 
 
-class TestCrudiniPy2(TestCrudiniBase):
-    __test__ = True
-    config = TestCrudiniBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        """
-
-
 class TestCrudiniPy3(TestCrudiniBase):
     __test__ = True
     config = TestCrudiniBase.config + \

index 78c928484c..5c29dea04f 100644
@@ -1,18 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Libftdi1(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_LIBFTDI1=y
-        BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS=y
-        """
-    sample_scripts = ["tests/package/sample_libftdi1.py"]
-    timeout = 40
-
-
 class TestPythonPy3Libftdi1(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index 60da8765c4..f29aff6624 100644
@@ -39,20 +39,6 @@ class TestPythonBase(infra.basetest.BRTest):
         self.assertEqual(exit_code, 1)
 
 
-class TestPython2(TestPythonBase):
-    config = TestPythonBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        """
-
-    def test_run(self):
-        self.login()
-        self.version_test("Python 2")
-        self.math_floor_test()
-        self.libc_time_test()
-        self.zlib_test()
-
-
 class TestPython3(TestPythonBase):
     config = TestPythonBase.config + \
         """

index de4b4cbe74..887d9acd46 100644
@@ -27,15 +27,6 @@ class TestPythonArgh(TestPythonPackageBase):
         self.assertEqual(exit_code, 2)
 
 
-class TestPythonPy2Argh(TestPythonArgh):
-    __test__ = True
-    config = TestPythonArgh.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_ARGH=y
-        """
-
-
 class TestPythonPy3Argh(TestPythonArgh):
     __test__ = True
     config = TestPythonArgh.config + \

index 63b3fdb69c..bd358a2fc5 100644
@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Bitstring(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_BITSTRING=y
-        """
-    sample_scripts = ["tests/package/sample_python_bitstring.py"]
-
-
 class TestPythonPy3Bitstring(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index d509d05dbb..dba5539c5d 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Can(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_CAN=y
-        """
-    sample_scripts = ["tests/package/sample_python_can.py"]
-    timeout = 40
-
-
 class TestPythonPy3Can(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index 9da3503763..23a1e3e701 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Cbor(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_CBOR=y
-        """
-    sample_scripts = ["tests/package/sample_python_cbor_enc.py",
-                      "tests/package/sample_python_cbor_dec.py"]
-
-
 class TestPythonPy3Cbor(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index db57d3aa9f..0ee9702cce 100644
@@ -26,15 +26,6 @@ class TestPythonClick(TestPythonPackageBase):
         self.assertEqual(exit_code, 2)
 
 
-class TestPythonPy2Click(TestPythonClick):
-    __test__ = True
-    config = TestPythonClick.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_CLICK=y
-        """
-
-
 class TestPythonPy3Click(TestPythonClick):
     __test__ = True
     config = TestPythonClick.config + \

index 5be01c4f8c..edcb9bfd69 100644
@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Constantly(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_CONSTANTLY=y
-        """
-    sample_scripts = ["tests/package/sample_python_constantly.py"]
-
-
 class TestPythonPy3Constantly(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index 0c71f6b6d0..8861115130 100644
@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2GnuPG(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_GNUPG=y
-        """
-    sample_scripts = ["tests/package/sample_python_gnupg.py"]
-
-
 class TestPythonPy3GnuPG(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index 49800d8937..4c53d61321 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Incremental(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_INCREMENTAL=y
-        """
-    sample_scripts = ["tests/package/sample_python_incremental.py"]
-    timeout = 30
-
-
 class TestPythonPy3Incremental(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index 7c85882bf8..e12e86d91b 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Passlib(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_PASSLIB=y
-        """
-    sample_scripts = ["tests/package/sample_python_passlib.py"]
-    timeout = 30
-
-
 class TestPythonPy3Passlib(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index ba31cdbdbe..70037a7d3c 100644
@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Pexpect(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_PEXPECT=y
-        """
-    sample_scripts = ["tests/package/sample_python_pexpect.py"]
-
-
 class TestPythonPy3Pexpect(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index f4dd54940a..cef8a7e780 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Pynacl(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_PYNACL=y
-        """
-    sample_scripts = ["tests/package/sample_python_pynacl.py"]
-    timeout = 10
-
-
 class TestPythonPy3Pynacl(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index cd45a57b86..9d0a351f72 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Pyyaml(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_PYYAML=y
-        """
-    sample_scripts = ["tests/package/sample_python_pyyaml_enc.py",
-                      "tests/package/sample_python_pyyaml_dec.py"]
-
-
 class TestPythonPy3Pyyaml(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

deleted file mode 100644
index d2878046d1..0000000000
@@ -1,11 +0,0 @@
-from tests.package.test_python import TestPythonPackageBase
-
-
-class TestPythonPy2Subprocess32(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_SUBPROCESS32=y
-        """
-    sample_scripts = ["tests/package/sample_python_subprocess32.py"]

index 85c707e292..a15dbd54b8 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Ubjson(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_UBJSON=y
-        """
-    sample_scripts = ["tests/package/sample_python_ubjson_enc.py",
-                      "tests/package/sample_python_ubjson_dec.py"]
-
-
 class TestPythonPy3Ubjson(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

index 34d8c71cc8..6bc3803a5c 100644
@@ -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

index d631ed784a..ca2fb363e3 100644
@@ -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"

139 lines not on this page · raw message

index 4168d1f220..af3de984d9 100644
@@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB
 
 config BR2_PACKAGE_ALSA_LIB_PYTHON
 	bool "Python support for alsa-lib"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  Add python support for alsa-lib.
 	  Python will be built and libpython will be installed

index b5cd3f0d13..5d12f5e6d8 100644
@@ -61,20 +61,11 @@ endif
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
 ALSA_LIB_CONF_OPTS += \
-	--enable-mixer-pymods
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-ALSA_LIB_CONF_OPTS += \
-	--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \
-	--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-ALSA_LIB_DEPENDENCIES += python
-else
-ALSA_LIB_CONF_OPTS += \
+	--enable-mixer-pymods \
 	--with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \
 	--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
 ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
 ALSA_LIB_DEPENDENCIES += python3
-endif
 else
 ALSA_LIB_CONF_OPTS += --disable-python
 endif

index 83b4d92786..91081069c7 100644
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_BMAP_TOOLS
 	bool "bmap-tools"
-	depends on BR2_PACKAGE_PYTHON3 || BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help

index 2c458bf88a..33a5337096 100644
@@ -296,7 +296,7 @@ config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
 
 config BR2_PACKAGE_BOOST_PYTHON
 	bool "boost-python"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  The Boost Python Library is a framework for interfacing Python
 	  and C++. It allows you to quickly and seamlessly expose C++

index b6681b0ad3..032ba5c820 100644
@@ -68,16 +68,11 @@ BOOST_DEPENDENCIES += bzip2 zlib
 endif
 
 ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y)
-BOOST_FLAGS += --with-python-root=$(HOST_DIR)
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
-BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)
+BOOST_FLAGS += \
+	--with-python-root=$(HOST_DIR) \
+	--with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)
 BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
 BOOST_DEPENDENCIES += python3
-else
-BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR)
-BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-BOOST_DEPENDENCIES += python
-endif
 endif
 
 HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \

index f15d1e3dc4..d1b1406a3e 100644
@@ -21,7 +21,7 @@ config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS
 	depends on BR2_USE_WCHAR # python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
 	depends on !BR2_STATIC_LIBS # python3
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3 # runtime
 	help
 	  Install the smb tools smbinfo and smb2-quota (python
 	  implementations).

index 8e6a844f11..46917b7926 100644
@@ -20,9 +20,12 @@ else
 CRACKLIB_CONF_OPTS += --without-zlib
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 CRACKLIB_CONF_OPTS += --with-python
-CRACKLIB_DEPENDENCIES += python
+CRACKLIB_CONF_ENV += \
+	ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \
+	am_cv_python_version=$(PYTHON3_VERSION_MAJOR)
+CRACKLIB_DEPENDENCIES += python3
 else
 CRACKLIB_CONF_OPTS += --without-python
 endif

index 240848dffc..ff4c98d579 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_CRUDINI
 	bool "crudini"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_INIPARSE # runtime
 	help
 	  A utility for handling ini files from the command line and

index 4bfb59ed91..76453e168a 100644
@@ -3,16 +3,14 @@ config BR2_PACKAGE_DBUS_PYTHON
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_PACKAGE_DBUS
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_LIBGLIB2
-	# pyexpat: runtime dependency only
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Python bindings for D-Bus
 
 	  http://dbus.freedesktop.org/doc/dbus-python/
 
 comment "dbus-python needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
+	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON3
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

index 3e28aed25c..d9bb30ed67 100644
@@ -9,40 +9,20 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python
 DBUS_PYTHON_INSTALL_STAGING = YES
 DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain)
 DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING
-DBUS_PYTHON_DEPENDENCIES = dbus libglib2
-HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2
+DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3
+HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-DBUS_PYTHON_DEPENDENCIES += python host-python
-
-DBUS_PYTHON_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/bin/python2 \
-	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \
-	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`"
-
-HOST_DBUS_PYTHON_DEPENDENCIES += host-python
-
-HOST_DBUS_PYTHON_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/bin/python2 \
-	PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \
-	PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`"
-else
-DBUS_PYTHON_DEPENDENCIES += python3 host-python3
-
-DBUS_PYTHON_CONF_ENV += \
+DBUS_PYTHON_CONF_ENV = \
 	PYTHON=$(HOST_DIR)/bin/python3 \
 	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \
 	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \
 	PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`"
 
-HOST_DBUS_PYTHON_DEPENDENCIES += host-python3
-
-HOST_DBUS_PYTHON_CONF_ENV += \
+HOST_DBUS_PYTHON_CONF_ENV = \
 	PYTHON=$(HOST_DIR)/bin/python3 \
 	PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \
 	PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \
 	PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`"
-endif
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

index 761befea4d..f82a0c4bc2 100644
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_DOCKER_COMPOSE
 	bool "docker-compose"
-	depends on !BR2_PACKAGE_PYTHON # python-paramiko -> python-bcrypt
-	depends on BR2_USE_MMU # python
-	depends on BR2_USE_WCHAR # python
-	depends on BR2_TOOLCHAIN_HAS_THREADS # python
-	depends on !BR2_STATIC_LIBS # python
+	depends on BR2_USE_MMU # python3
+	depends on BR2_USE_WCHAR # python3
+	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
+	depends on !BR2_STATIC_LIBS # python3
 	# python-paramiko -> python-cryptography
 	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
 	select BR2_PACKAGE_PYTHON3

index 647a7033c6..09d1970f73 100644
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_DSTAT
 	bool "dstat"
-	depends on BR2_USE_WCHAR # python
-	depends on BR2_USE_MMU # python
-	depends on BR2_TOOLCHAIN_HAS_THREADS # python
-	depends on !BR2_STATIC_LIBS # python
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
+	depends on BR2_USE_WCHAR # python3
+	depends on BR2_USE_MMU # python3
+	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
+	depends on !BR2_STATIC_LIBS # python3
+	select BR2_PACKAGE_PYTHON3 # runtime
 	help
 	  Dstat, written in Python, is a versatile replacement for
 	  vmstat, iostat, netstat and ifstat. Dstat overcomes some of

index 02e5abdb8f..b27033afa4 100644
@@ -22,9 +22,9 @@ EVEMU_CONF_OPTS += --disable-tests
 EVEMU_DEPENDENCIES = host-pkgconf libevdev
 
 # Check for target python
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 EVEMU_CONF_OPTS += --enable-python-bindings
-EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python)
+EVEMU_DEPENDENCIES += python3
 else
 EVEMU_CONF_OPTS += --disable-python-bindings
 endif

index 86e6233793..8a48a8c1d0 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_FAIL2BAN
 	bool "fail2ban"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD
 	help
 	  Fail2ban scans log files (e.g. /var/log/apache/error_log) and

index 9202dc1ddd..4a08981a97 100644
@@ -15,15 +15,13 @@ FAIL2BAN_SETUP_TYPE = distutils
 # 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch
 FAIL2BAN_IGNORE_CVES += CVE-2021-32749
 
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
 define FAIL2BAN_PYTHON_2TO3
 	$(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban
 endef
-FAIL2BAN_DEPENDENCIES += host-python3
+FAIL2BAN_DEPENDENCIES = host-python3
 # We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed
 # to build and install before _POST_PATCH_HOOKS run.
 FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3
-endif
 
 define FAIL2BAN_FIX_DEFAULT_CONFIG
 	$(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf

@@ -34,8 +32,7 @@ FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG
 
 # fail2ban-python points to host python
 define FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK
-	ln -snf $(if $(BR2_PACKAGE_PYTHON),python,python3) \
-		$(TARGET_DIR)/usr/bin/fail2ban-python
+	ln -snf python3	$(TARGET_DIR)/usr/bin/fail2ban-python
 endef
 FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK
 

index 2d15a7e270..317eb62898 100644
@@ -33,7 +33,6 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_TESTING
 
 config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS
 	bool "Install scripts"
-	depends on !BR2_PACKAGE_PYTHON # python3
 	depends on !BR2_STATIC_LIBS # python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
 	depends on BR2_USE_MMU # bash, python3

index 1da9a5ce2a..b66d0952dd 100644
@@ -81,8 +81,8 @@ config BR2_PACKAGE_GPSD_SQUELCH
 
 config BR2_PACKAGE_GPSD_PYTHON
 	bool "build Python support and modules"
-	depends on BR2_USE_WCHAR # python
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
+	depends on BR2_USE_WCHAR # python3
+	select BR2_PACKAGE_PYTHON3
 	help
 	  Python libraries and tools for the gpsd service daemon
 	  including gpsfake test harness.

index 636c6c95ba..4388b7e24d 100644
@@ -194,10 +194,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y)
 GPSD_SCONS_OPTS += \
 	python=yes \
 	python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages"
-else ifeq ($(BR2_PACKAGE_PYTHON),y)
-GPSD_SCONS_OPTS += \
-	python=yes \
-	python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"
 else
 GPSD_SCONS_OPTS += python=no
 endif

index 55cf25d53e..3f39beff53 100644
@@ -1,11 +1,10 @@
 config BR2_PACKAGE_GST1_DEVTOOLS
 	bool "gst1-devtools"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_GSTREAMER1_CHECK
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	select BR2_PACKAGE_JSON_GLIB
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT
 	# cairo is autodetected but needs PNG support
 	select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO
 	help

@@ -14,5 +13,4 @@ config BR2_PACKAGE_GST1_DEVTOOLS
 	  https://gstreamer.freedesktop.org
 
 comment "gst1-devtools depends on python"
-	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_PACKAGE_PYTHON3

index 7565349f5e..5c9ce26628 100644
@@ -13,10 +13,6 @@ I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project
 I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog
 I2C_TOOLS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-I2C_TOOLS_DEPENDENCIES += python
-endif
-
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 I2C_TOOLS_DEPENDENCIES += python3
 endif

@@ -31,7 +27,7 @@ endif
 
 # Build/install steps mirror the distutil python package type in the python package
 # infrastructure
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 # BASE_ENV taken from PKG_PYTHON_DISTUTILS_ENV in package/pkg-python.mk
 I2C_TOOLS_PYTHON_BASE_ENV = \
 	$(PKG_PYTHON_DISTUTILS_ENV) \

@@ -51,7 +47,7 @@ define I2C_TOOLS_INSTALL_PYSMBUS
 		$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS))
 endef
 
-endif # BR2_PACKAGE_PYTHON
+endif # BR2_PACKAGE_PYTHON3
 
 define I2C_TOOLS_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) -C $(@D)

index ada6131606..460503b9d7 100644
@@ -1,11 +1,10 @@
-comment "iotop depends on python or python3"
-	depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3
+comment "iotop depends on python3"
+	depends on !BR2_PACKAGE_PYTHON3
 
 config BR2_PACKAGE_IOTOP
 	bool "iotop"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_CURSES
 	help
 	  iotop does for I/O usage what top does for CPU usage.
 

index f9de7be041..bc883190d5 100644
@@ -37,9 +37,8 @@ config BR2_PACKAGE_JACK2_DBUS
 	depends on BR2_USE_WCHAR # dbus-python, python
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_PYTHON
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Build and use jackdbus.
 

index c7f510ec0f..82e8597759 100644
@@ -62,8 +62,8 @@ else
 KMOD_CONF_OPTS += --without-openssl
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
-KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+KMOD_DEPENDENCIES += python3
 KMOD_CONF_OPTS += --enable-python
 endif
 

index 6591bc009a..8b5d70d008 100644
@@ -20,8 +20,8 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 LIBCEC_DEPENDENCIES += udev
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
-LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+LIBCEC_DEPENDENCIES += host-swig python3
 endif
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)

index 93ba88ca88..4c23156f72 100644
@@ -25,7 +25,7 @@ endef
 
 # libevent installs a python script to target - get rid of it if we
 # don't have python support enabled
-ifneq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifneq ($(BR2_PACKAGE_PYTHON3),y)
 LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT
 endif
 

index 2d32573563..ec91366115 100644
@@ -24,7 +24,7 @@ comment "libftdipp1 needs a toolchain w/ C++, wchar"
 
 config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS
 	bool "python bindings"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  Python bindings for libftdi
 

index 6688694b47..d2e3f42e14 100644
@@ -24,7 +24,7 @@ LIBFTDI1_CONF_OPTS += -DFTDIPP=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS),y)
-LIBFTDI1_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) host-swig
+LIBFTDI1_DEPENDENCIES += python3 host-swig
 LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=ON
 else
 LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=OFF

index 0d89331c89..98d663e203 100644
@@ -91,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP
 
 config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON
 	bool "Install Python bindings"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  Install the Python bindings.
 

index a4fe0d4541..48e2f385e3 100644
@@ -73,14 +73,10 @@ LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y)
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-LIBIIO_DEPENDENCIES += host-python-setuptools python
-LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIBIIO_DEPENDENCIES += host-python3-setuptools python3
-LIBIIO_CONF_OPTS += -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3
-endif
-LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON
+LIBIIO_CONF_OPTS += \
+	-DPYTHON_BINDINGS=ON
+	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3
 else
 LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF
 endif

index 54a03be453..d4f7a47120 100644
@@ -12,9 +12,9 @@ LIBPWQUALITY_INSTALL_STAGING = YES
 LIBPWQUALITY_DEPENDENCIES = cracklib
 LIBPWQUALITY_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIBPWQUALITY_CONF_OPTS += --enable-python-bindings
-LIBPWQUALITY_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python)
+LIBPWQUALITY_DEPENDENCIES += python3
 LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV)
 else
 LIBPWQUALITY_CONF_OPTS += --disable-python-bindings

index 28cbb5ca5e..b58c8a2a29 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBSIGROKDECODE
 	bool "libsigrokdecode"
-	depends on !BR2_PACKAGE_PYTHON # python3
 	depends on BR2_USE_WCHAR # libglib2/python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3
 	depends on BR2_USE_MMU # libglib2/python3

@@ -19,9 +18,4 @@ config BR2_PACKAGE_LIBSIGROKDECODE
 
 comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-comment "libsigrokdecode is not compatible with python"
-	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_PYTHON

index bbc33143cc..95753b8b68 100644
@@ -12,12 +12,8 @@ LIBSOC_AUTORECONF = YES
 LIBSOC_INSTALL_STAGING = YES
 LIBSOC_DEPENDENCIES = host-pkgconf
 
-# Install Python 2 bindings
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-LIBSOC_DEPENDENCIES += python
-LIBSOC_CONF_OPTS += --enable-python=2
 # Install Python 3 bindings
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIBSOC_DEPENDENCIES += python3
 LIBSOC_CONF_OPTS += --enable-python=3
 else

index ef7d1a6200..7ead28052e 100644
@@ -20,10 +20,7 @@ LTTNG_LIBUST_AUTORECONF = YES
 # https://www.mail-archive.com/[email protected]/msg12950.html
 LTTNG_LIBUST_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DUATOMIC_NO_LINK_ERROR"
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-LTTNG_LIBUST_DEPENDENCIES += python
-LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LTTNG_LIBUST_DEPENDENCIES += python3
 LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
 else

index ab8c473951..54b48e4ca8 100644
@@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORKD_DISPATCHER
 	depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection -> host-qemu
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection
 	depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection
-	depends on !BR2_PACKAGE_PYTHON # python3
 	depends on BR2_PACKAGE_SYSTEMD # runtime
 	select BR2_PACKAGE_DBUS # dbus-python
 	select BR2_PACKAGE_DBUS_PYTHON # runtime

@@ -23,7 +22,6 @@ config BR2_PACKAGE_NETWORKD_DISPATCHER
 comment "networkd-dispatcher needs a glibc toolchain, gcc >= 4.9, host gcc >= 8"
 	depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_SYSTEMD
-	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_HOST_GCC_AT_LEAST_8 || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
 		!BR2_TOOLCHAIN_USES_GLIBC

index d5c16ac2be..232d541488 100644
@@ -35,9 +35,9 @@ else
 NFTABLES_CONF_OPTS += --without-json
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 NFTABLES_CONF_OPTS += --enable-python
-NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
+NFTABLES_DEPENDENCIES += python3
 else
 NFTABLES_CONF_OPTS += --disable-python
 endif

index 72fd616c0c..3fd2fc4650 100644
@@ -42,9 +42,8 @@ OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \
 	-DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)"
 
 # Enable optional python component if python interpreter is present on the target.
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
-OGRE_DEPENDENCIES += host-swig \
-	$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+OGRE_DEPENDENCIES += host-swig host-python3
 OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=ON
 else
 OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=OFF

index 3c5a3ee347..2973055baf 100644
@@ -5,7 +5,6 @@ config BR2_PACKAGE_OPKG_UTILS
 	depends on BR2_USE_WCHAR # python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python3 <- libffi
 	depends on !BR2_STATIC_LIBS # python3
-	depends on !BR2_PACKAGE_PYTHON # python3
 	select BR2_PACKAGE_BINUTILS if !BR2_PACKAGE_BUSYBOX # runtime
 	select BR2_PACKAGE_BINUTILS_TARGET if !BR2_PACKAGE_BUSYBOX # runtime
 	select BR2_PACKAGE_COREUTILS if !BR2_PACKAGE_BUSYBOX # runtime

@@ -27,8 +26,3 @@ comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library"
 	depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-comment "opkg-utils needs python3"
-	depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX
-	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_PYTHON

index 7c69a5251b..986dca921a 100644
@@ -67,30 +67,8 @@ else
 OWFS_CONF_OPTS += --disable-avahi
 endif
 
-# setup.py isn't python3 compliant
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-OWFS_CONF_OPTS += \
-	--enable-owpython \
-	--with-python \
-	--with-pythonconfig=$(STAGING_DIR)/usr/bin/python-config
-OWFS_MAKE_ENV += \
-	CC="$(TARGET_CC)" \
-	PYTHONPATH="$(PYTHON_PATH)" \
-	_python_sysroot=$(STAGING_DIR) \
-	_python_prefix=/usr \
-	_python_exec_prefix=/usr
-OWFS_DEPENDENCIES += python host-swig
-# The configure scripts finds PYSITEDIR as the python_lib directory of
-# host-python, and then prepends DESTDIR in front of it. So we end up
-# installing things in $(TARGET_DIR)/$(HOST_DIR)/lib/python which is
-# clearly wrong.
-# Patching owfs to do the right thing is not trivial, it's much easier to
-# override the PYSITEDIR variable in make.
-OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-
-else
+# python2 only (https://github.com/owfs/owfs/pull/32)
 OWFS_CONF_OPTS += --disable-owpython --without-python
-endif
 
 ifeq ($(BR2_STATIC_LIBS),y)
 # zeroconf support uses dlopen()

index 98695d99ce..72eaa1db2b 100644
@@ -11,13 +11,4 @@ PYTHON_AENUM_SETUP_TYPE = setuptools
 PYTHON_AENUM_LICENSE = BSD-3-Clause
 PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_AENUM_RM_PY3_FILE
-	rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/aenum/test_v3.py
-endef
-
-PYTHON_AENUM_POST_INSTALL_TARGET_HOOKS += PYTHON_AENUM_RM_PY3_FILE
-endif
-
 $(eval $(python-package))

index 16bbe6c4e3..5cddb3314e 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI
 	depends on BR2_USE_MMU # libargon2
 	depends on !BR2_STATIC_LIBS # libargon2
 	select BR2_PACKAGE_PYTHON_CFFI # runtime
-	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_LIBARGON2
 	help

index a383cda0f5..32070fb9a8 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_BSDIFF4
 	bool "python-bsdiff4"
-	select BR2_PACKAGE_PYTHON_BZIP2 if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_BZIP2 if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_BZIP2 # runtime
 	help
 	  binary diff and patch using the BSDIFF4-format.
 

index 3d06374c6a..dc9eb0ae4e 100644
@@ -1,13 +1,10 @@
 config BR2_PACKAGE_PYTHON_CAN
 	bool "python-can"
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
-	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_SQLITE # runtime
 	select BR2_PACKAGE_PYTHON_AENUM # runtime
 	select BR2_PACKAGE_PYTHON_WRAPT # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  This module provides controller area network support for
 	  Python.

index 9156883b38..5bff75750b 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_COUCHDB
 	bool "python-couchdb"
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_SSL # runtime
 	help
 	  Python client library for working with CouchDB.
 

index e38a5f7909..145887eddc 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_DICTTOXML
 	bool "python-dicttoxml"
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT
 	help
 	  Converts a Python dictionary or other native data type into
 	  a valid XML string.

index 9bd7a98d26..819d0fb613 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_DPKT
 	bool "python-dpkt"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  Fast, simple packet creation / parsing, with definitions
 	  for the basic TCP/IP protocols.

index 570f9aa42f..b21ccd72d5 100644
@@ -3,8 +3,7 @@ config BR2_PACKAGE_PYTHON_ESPTOOL
 	select BR2_PACKAGE_PYTHON_ECDSA # runtime
 	select BR2_PACKAGE_PYTHON_PYAES # runtime
 	select BR2_PACKAGE_PYTHON_SERIAL # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  A serial utility to communicate & flash code to Espressif
 	  ESP8266 & ESP32 chips.

index b718ddac5e..9c816b0fd0 100644
@@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_FIRE
 	bool "python-fire"
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_PYTHON_TERMCOLOR # runtime
-	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  A library for automatically generating command line
 	  interfaces.

index 7ba971abc4..40631fce86 100644
@@ -11,13 +11,4 @@ PYTHON_FIRE_SETUP_TYPE = setuptools
 PYTHON_FIRE_LICENSE = Apache-2.0
 PYTHON_FIRE_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_FIRE_RM_PY3_FILE
-	rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/fire/test_components_py3.py
-endef
-
-PYTHON_FIRE_POST_INSTALL_TARGET_HOOKS += PYTHON_FIRE_RM_PY3_FILE
-endif
-
 $(eval $(python-package))

index 56bfe10f01..8a44bf2db4 100644
@@ -1,15 +1,12 @@
 config BR2_PACKAGE_PYTHON_FLASK
 	bool "python-flask"
-	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_CLICK # runtime
 	select BR2_PACKAGE_PYTHON_JINJA2 # runtime
 	select BR2_PACKAGE_PYTHON_WERKZEUG # runtime
 	select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_SSL
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  Flask is a microframework for Python based on Werkzeug,
 	  Jinja 2 and good intentions.

index b547f4ae1a..7002653722 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_JSONSCHEMA
 	bool "python-jsonschema"
-	select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  An implementation of JSON Schema validation for Python.
 

index 2db7e99cf3..c7d87f408a 100644
@@ -14,14 +14,8 @@ PYTHON_LIBCONFIG_SETUP_TYPE = setuptools
 
 PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_LIBCONFIG_PYVER = $(PYTHON_VERSION_MAJOR)
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-PYTHON_LIBCONFIG_PYVER = $(PYTHON3_VERSION_MAJOR)
-endif
-
 define PYTHON_LIBCONFIG_FIX_SETUP
-	$(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON_LIBCONFIG_PYVER))/g' \
+	$(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON3_VERSION_MAJOR))/g' \
 		$(@D)/setup.py
 endef
 PYTHON_LIBCONFIG_POST_PATCH_HOOKS += PYTHON_LIBCONFIG_FIX_SETUP

index d4fbf0fe67..99996b6517 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_LOGBOOK
 	bool "python-logbook"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  A logging replacement for Python.
 

index fcb30d56ee..3f3cb5c550 100644
@@ -2,8 +2,7 @@ config BR2_PACKAGE_PYTHON_LXML
 	bool "python-lxml"
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  The lxml XML toolkit is a Pythonic binding for the C libraries
 	  libxml2 and libxslt.

index 7481d49e5c..af710d5351 100644
@@ -1,11 +1,8 @@
 config BR2_PACKAGE_PYTHON_M2CRYPTO
 	bool "python-m2crypto"
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
+	select BR2_PACKAGE_PYTHON3_SSL # runtime
 	help
 	  M2Crypto: A Python crypto and SSL toolkit.
 

index a9609cbe79..3efda26825 100644
@@ -11,14 +11,4 @@ PYTHON_PEXPECT_LICENSE = ISC
 PYTHON_PEXPECT_LICENSE_FILES = LICENSE
 PYTHON_PEXPECT_SETUP_TYPE = distutils
 
-# async.py is not usable with Python 2, and removing is the solution
-# recommended by upstream:
-# https://github.com/pexpect/pexpect/issues/290
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-define PYTHON_PEXPECT_REMOVE_ASYNC_PY
-	$(RM) $(@D)/pexpect/_async.py
-endef
-PYTHON_PEXPECT_POST_PATCH_HOOKS += PYTHON_PEXPECT_REMOVE_ASYNC_PY
-endif
-
 $(eval $(python-package))

index 35a26637a5..18391b7ce8 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PICKLESHARE
 	bool "python-pickleshare"
-	select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  Tiny 'shelve'-like database with concurrency support
 

index 9135a4d0c4..d96e21a55c 100644
@@ -11,13 +11,4 @@ PYTHON_PYMODBUS_SETUP_TYPE = setuptools
 PYTHON_PYMODBUS_LICENSE = BSD-3-Clause
 PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_PYMODBUS_RM_PY3_FILES
-	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pymodbus/client/asynchronous/asyncio
-endef
-
-PYTHON_PYMODBUS_POST_INSTALL_TARGET_HOOKS += PYTHON_PYMODBUS_RM_PY3_FILES
-endif
-
 $(eval $(python-package))

index 01b7ae8132..d07ab4965a 100644
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_PYTHON_PYQRCODE
 	bool "python-pyqrcode"
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_CODECSCJK if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_CODECSCJK if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
+	select BR2_PACKAGE_PYTHON3_CODECSCJK # runtime
 	help
 	  A QR code generator written purely in Python with SVG, EPS,
 	  PNG and terminal output.

index b05043563e..af32f63796 100644
@@ -19,14 +19,6 @@ PYTHON_PYQT5_MODULES = \
 	$(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \
 	$(if $(BR2_PACKAGE_QT5BASE_XML),QtXml)
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR)
-PYTHON_PYQT5_RM_PORT_BASE = port_v3
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR)
-PYTHON_PYQT5_RM_PORT_BASE = port_v2
-endif
-
 ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
 PYTHON_PYQT5_MODULES += QtWidgets
 

@@ -159,7 +151,7 @@ PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP
 
 PYTHON_PYQT5_CONF_OPTS = \
 	--bindir $(TARGET_DIR)/usr/bin \
-	--destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \
+	--destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
 	--qmake $(HOST_DIR)/bin/qmake \
 	--sysroot $(STAGING_DIR)/usr \
 	-w --confirm-license \

@@ -186,8 +178,8 @@ endef
 # __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set
 define PYTHON_PYQT5_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install
-	touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py
-	$(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE)
+	touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py
+	$(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2
 endef
 
 $(eval $(generic-package))

index 5df0a63d4b..9e685f9d1e 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_PYROUTE2
 	bool "python-pyroute2"
-	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_SQLITE
 	help
 	  Python netlink library - Linux network / netns / wireless /
 	  ipset configuration.

index fb853956e8..e0da067cc2 100644
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_PYTHON_PYUDEV
 	bool "python-pyudev"
 	depends on BR2_PACKAGE_HAS_UDEV
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
 	  pyudev is a LGPL licenced, pure Python 2/3 binding to

index 0d4b26c054..d02232cfd8 100644
@@ -1,11 +1,8 @@
 config BR2_PACKAGE_PYTHON_RAVEN
 	bool "python-raven"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
+	select BR2_PACKAGE_PYTHON3_SSL
+	select BR2_PACKAGE_PYTHON3_UNICODEDATA
 	help
 	  Raven is a client for Sentry (https://getsentry.com).
 

index 8ebbe395c8..07d8988a18 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_PYTHON_REENTRY
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
 	select BR2_PACKAGE_PYTHON_CLICK # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  A plugin manager based on setuptools entry points mechanism.
 

index e0c5e9bfe1..da2c2f4cfb 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_REMI
 	bool "python-remi"
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_SSL # runtime
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
 	help
 	  Remi is a GUI library for Python applications which transpiles

index 6575a33af3..517fb51714 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_SCAPY
 	bool "python-scapy"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  Scapy: interactive packet manipulation tool.
 

index 556f03e137..9238b7fb1c 100644
@@ -11,14 +11,4 @@ PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools
 PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause
 PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_SENTRY_SDK_RM_PY3_FILES
-	rm -f $(addprefix $(TARGET_DIR)/usr/lib/python*/site-packages/sentry_sdk/integrations/,\
-		aiohttp.py asgi.py django/asgi.py httpx.py sanic.py tornado.py)
-endef
-
-PYTHON_SENTRY_SDK_POST_INSTALL_TARGET_HOOKS += PYTHON_SENTRY_SDK_RM_PY3_FILES
-endif
-
 $(eval $(python-package))

index f203d0f814..28228534f8 100644
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_PYTHON_SETUPTOOLS
 	bool "python-setuptools"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Download, build, install, upgrade, and uninstall Python
 	  packages.

index 8bca852fe2..04b872fb79 100644
@@ -4,19 +4,11 @@
 #
 ################################################################################
 
-# For the target variant, we adapt the version depending on whether
-# Python 3.x or 2.x is selected for the target.
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
 # Please keep in sync with
 # package/python3-setuptools/python3-setuptools.mk
 PYTHON_SETUPTOOLS_VERSION = 60.7.0
 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz
 PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440
-else # Python
-PYTHON_SETUPTOOLS_VERSION = 44.0.0
-PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip
-PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485
-endif
 
 # The host variant is only for Python 2.x, so we need to use 44.0.0.
 HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0

@@ -30,14 +22,6 @@ PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python
 PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools
 PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-define PYTHON_SETUPTOOLS_EXTRACT_CMDS
-	$(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE)
-	mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D)
-	$(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)
-endef
-endif
-
 define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS
 	$(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE)
 	mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D)

index 1d6c205396..01ccb1ddd5 100644
@@ -10,19 +10,8 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON
 PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0
 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3
 
-PYTHON_SIP_DEPENDENCIES = qt5base
-
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_SIP_DEPENDENCIES += python
-HOST_PYTHON_SIP_DEPENDENCIES += host-python
-PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON_VERSION_MAJOR)
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-PYTHON_SIP_DEPENDENCIES += python3
-HOST_PYTHON_SIP_DEPENDENCIES += host-python3
-PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages
-PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR)
-endif
+PYTHON_SIP_DEPENDENCIES = python3 qt5base
+HOST_PYTHON_SIP_DEPENDENCIES = host-python3
 
 define HOST_PYTHON_SIP_CONFIGURE_CMDS
 	(cd $(@D); \

@@ -41,8 +30,8 @@ define PYTHON_SIP_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \
 			--bindir $(TARGET_DIR)/usr/bin \
-			--destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \
-			--incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \
+			--destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
+			--incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
 			--sipdir $(TARGET_DIR)/usr/share/sip \
 			--sysroot $(STAGING_DIR)/usr \
 			--use-qmake && \

index b8414d96d0..acf586cb8c 100644
@@ -11,13 +11,4 @@ PYTHON_TXTORCON_SETUP_TYPE = setuptools
 PYTHON_TXTORCON_LICENSE = MIT
 PYTHON_TXTORCON_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-# only needed/valid for python 3.x
-define PYTHON_TXTORCON_RM_PY3_FILE
-	rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/txtorcon/controller_py3.py
-endef
-
-PYTHON_TXTORCON_POST_INSTALL_TARGET_HOOKS += PYTHON_TXTORCON_RM_PY3_FILE
-endif
-
 $(eval $(python-package))

index 0c7c74c5fa..b59693282f 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS
 	bool "python-typing-extensions"
-	select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime
 	help
 	  Backported and Experimental Type Hints for Python 3.5+.
 

index 21d3f6748e..90e10b7969 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_URLLIB3
 	bool "python-urllib3"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  Python HTTP library with thread-safe connection pooling, file
 	  post support, sanity friendly, and more.

index a0452060ba..bb455dfa7a 100644
@@ -1,12 +1,9 @@
 config BR2_PACKAGE_PYTHON_WEB2PY
 	bool "python-web2py"
 	select BR2_PACKAGE_PYTHON_PYDAL # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
+	select BR2_PACKAGE_PYTHON3_SQLITE # runtime
 	select BR2_PACKAGE_PYTHON_YATL # runtime
 	help
 	  web2py is a free open source full-stack framework for rapid

index fe77723f95..d3397587a1 100644
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_PYTHON_WEBOB
 	bool "python-webob"
-	select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  WSGI request and response object.
 

index 0fbb15b328..519e506615 100644
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT
 	bool "python-websocket-client"
 	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_SSL # runtime
 	help
 	  WebSocket client for python. hybi13 is supported.
 

index 79e9a4561e..27b2fdeaab 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_WERKZEUG
 	bool "python-werkzeug"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  Werkzeug is a WSGI utility library for Python. It's widely
 	  used and BSD licensed.

index 1128ce6417..e1fb144985 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_WHOOSH
 	bool "python-whoosh"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	help
 	  Whoosh is a fast, pure-Python full text indexing, search and
 	  spell checking library.

index 40920f7b02..264ee93e78 100644
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_PYTHON_XLRD
 	bool "python-xlrd"
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  Library for developers to extract data from Microsoft
 	  Excel(tm) spreadsheet files.

index cb12392c93..af2bbbf489 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_XMLTODICT
 	bool "python-xmltodict"
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Makes working with XML feel like you are working with JSON.
 

index 7714518edc..61470c2944 100644
@@ -4,7 +4,6 @@ comment "python3 needs a toolchain w/ wchar, threads, dynamic library"
 
 config BR2_PACKAGE_PYTHON3
 	bool "python3"
-	depends on !BR2_PACKAGE_PYTHON
 	depends on BR2_USE_WCHAR
 	# uses fork()
 	depends on BR2_USE_MMU

index f9afcd5097..6af7488ddd 100644
@@ -260,9 +260,7 @@ define PYTHON3_INSTALL_SYMLINK
 	ln -fs python3 $(TARGET_DIR)/usr/bin/python
 endef
 
-ifneq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK
-endif
 
 # Some packages may have build scripts requiring python3, whatever is the
 # python version chosen for the target.

index ee0ffecd13..a379002f95 100644
@@ -4,9 +4,8 @@ config BR2_PACKAGE_RANGER
 	depends on BR2_USE_WCHAR # python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
 	depends on !BR2_STATIC_LIBS # python3
-	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_CURSES
 	help
 	  ranger is a console file manager with VI key bindings. It
 	  provides a minimalistic and nice curses interface with a

index 6a518f97d4..ad50cc0735 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SELINUX_PYTHON
 	bool "selinux-python"
-	depends on !BR2_PACKAGE_PYTHON
 	depends on BR2_USE_MMU
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS

@@ -46,10 +45,6 @@ comment "sepolgen needs a toolchain w/ gcc 5"
 
 endif
 
-comment "selinux-python needs python3"
-	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_PYTHON
-
 comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \

index 00bf5994d1..bf3668a89b 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SNMPCLITOOLS
 	bool "snmpclitools"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_PYSMI # runtime
 	select BR2_PACKAGE_PYTHON_PYSNMP # runtime
 	help

index 7ca3cae134..8ba19dc000 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SUPERVISOR
 	bool "supervisor"
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency
 	help
 	  A client/server system that allows its users to control a

@@ -9,5 +9,4 @@ config BR2_PACKAGE_SUPERVISOR
 	  http://supervisord.org/
 
 comment "supervisor needs a python interpreter"
-	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_PACKAGE_PYTHON3

index 3255fd35a1..86d8970178 100644
@@ -116,9 +116,9 @@ else
 SURICATA_CONF_OPTS += --disable-luajit
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 SURICATA_CONF_OPTS += --enable-python
-SURICATA_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
+SURICATA_DEPENDENCIES += python3
 else
 SURICATA_CONF_OPTS += --disable-python
 endif

index f37e7c2ea5..c05ec9785c 100644
@@ -32,12 +32,7 @@ else
 SYSLOG_NG_CONF_OPTS += --disable-linux-caps
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-SYSLOG_NG_DEPENDENCIES += python
-SYSLOG_NG_CONF_OPTS += \
-	--enable-python \
-	--with-python=$(PYTHON_VERSION_MAJOR)
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 SYSLOG_NG_DEPENDENCIES += python3
 SYSLOG_NG_CONF_OPTS += \
 	--enable-python \

index f972e18852..3dbb0e229e 100644
@@ -4,7 +4,7 @@ config BR2_PACKAGE_TOVID
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv

@@ -40,8 +40,8 @@ comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9"
 		|| !BR2_USE_WCHAR
 	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
 
-comment "tovid depends on python or python3"
-	depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3
+comment "tovid depends on python3"
+	depends on !BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4

index d9ed417f20..fe0cd71ec4 100644
@@ -18,10 +18,7 @@ ifeq ($(BR2_PACKAGE_AUDIT),y)
 TRACE_CMD_DEPENDENCIES += audit
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-TRACE_CMD_DEPENDENCIES += python host-swig
-TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 TRACE_CMD_DEPENDENCIES += python3 host-swig
 TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3
 else

index 5a4ff64d01..1ca605f3fb 100644
@@ -241,9 +241,9 @@ HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs
 endif
 
 # Install libmount Python bindings
-ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 UTIL_LINUX_CONF_OPTS += --with-python
-UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
+UTIL_LINUX_DEPENDENCIES += python3
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
 UTIL_LINUX_CONF_OPTS += --enable-pylibmount
 else

index 0e7e3e4e74..6b542f5c05 100644
@@ -37,17 +37,7 @@ else
 ZFS_CONF_OPTS += --disable-systemd
 endif
 
-# The optional PyZFS uses different scripts depending on the python
-# version (ex: arc_summary2 or arc_summary3).
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-ZFS_DEPENDENCIES += python python-setuptools host-python-cffi host-python-packaging
-ZFS_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/usr/bin/python2 \
-	PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \
-	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" \
-	PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"
-ZFS_CONF_OPTS += --enable-pyzfs
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
 ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging
 ZFS_CONF_ENV += \
 	PYTHON=$(HOST_DIR)/usr/bin/python3 \

deleted file mode 100644
index 3b2c9833e8..0000000000
@@ -1,42 +0,0 @@
-From 3dc31a435b67de2ba3dd3457f0c939e20b58e8de Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:17:06 +0100
-Subject: [PATCH] setup.py: do not add invalid header locations
-
-This piece of code incorrectly adds /usr/include to
-self.compiler.include_dirs, and results in the following invalid
-compilation line:
-
-/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC \
-  -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
-  -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \
-  -I/usr/include -I. -IInclude -I./Include \
-  -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \
-  -I/home/thomas/projets/buildroot/output/build/python-2.7.6/Include \
-  -I/home/thomas/projets/buildroot/output/build/python-2.7.6 \
-  -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.c \
-  -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.o
-cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories]
-[...]
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 54054c2..64001e2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -496,7 +496,7 @@ class PyBuildExt(build_ext):
-                     for directory in reversed(options.dirs):
-                         add_dir_to_list(dir_list, directory)
- 
--        if os.path.normpath(sys.prefix) != '/usr' \
-+        if False and os.path.normpath(sys.prefix) != '/usr' \
-                 and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
--- 
-2.7.4
-

48 lines not on this page · raw message

88 lines not on this page · raw message

78 lines not on this page · raw message

deleted file mode 100644
index c910ae7181..0000000000
@@ -1,31 +0,0 @@
-From e674e29ceba34e55c9149ce99489e543aa4ebb01 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:19:47 +0100
-Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation
-
-The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't
-cross-compilation friendly.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6bd8369105..77ca6d86ca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3563,7 +3563,7 @@ fi
- 
- AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
- 
--if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
-+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
- then
- 	if test $ipv6 = yes
- 	then
--- 
-2.11.0
-

81 lines not on this page · raw message

64 lines not on this page · raw message

deleted file mode 100644
index d523b74638..0000000000
@@ -1,31 +0,0 @@
-From 87b627d8845e67fd798449b414bece04f18bd450 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:22:40 +0100
-Subject: [PATCH] Don't look in /usr/lib/termcap for libraries
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- setup.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 3b51c0a..fa32532 100644
---- a/setup.py
-+++ b/setup.py
-@@ -784,12 +784,9 @@ class PyBuildExt(build_ext):
-                 pass # Issue 7384: Already linked against curses or tinfo.
-             elif curses_library:
-                 readline_libs.append(curses_library)
--            elif self.compiler.find_library_file(lib_dirs +
--                                                     ['/usr/lib/termcap'],
--                                                     'termcap'):
-+            elif self.compiler.find_library_file(lib_dirs, 'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
-         else:
--- 
-2.7.4
-

229 lines not on this page · raw message

43 lines not on this page · raw message

deleted file mode 100644
index b84c9077c9..0000000000
@@ -1,36 +0,0 @@
-From 50a243a9c90f95e9248ac720e42e802b5922ab90 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:24:28 +0100
-Subject: [PATCH] Don't add multiarch paths
-
-The add_multiarch_paths() function leads, in certain build
-environments, to the addition of host header paths to the CFLAGS,
-which is not appropriate for cross-compilation. This patch fixes that
-by simply removing the call to add_multiarch_paths() when we're
-cross-compiling.
-
-Investigation done by David <[email protected]>.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index fa32532..0b9ea57 100644
---- a/setup.py
-+++ b/setup.py
-@@ -461,9 +461,9 @@ class PyBuildExt(build_ext):
-         if not cross_compiling:
-             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+            self.add_multiarch_paths()
-         if cross_compiling:
-             self.add_gcc_paths()
--        self.add_multiarch_paths()
- 
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
--- 
-2.7.4
-

deleted file mode 100644
index 7d952ca5c2..0000000000
@@ -1,30 +0,0 @@
-From a131e2ff219872d97eef6585117bd2f8ff9e310d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:24:48 +0100
-Subject: [PATCH] Abort on failed module build
-
-When building a Python module fails, the setup.py script currently
-doesn't exit with an error, and simply continues. This is not a really
-nice behavior, so this patch changes setup.py to abort with an error,
-so that the build issue is clearly noticeable.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index 0b9ea57..9a5c2b8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -299,6 +299,7 @@ class PyBuildExt(build_ext):
-             print "Failed to build these modules:"
-             print_three_column(failed)
-             print
-+            sys.exit(1)
- 
-     def build_extension(self, ext):
- 
--- 
-2.7.4
-

58 lines not on this page · raw message

deleted file mode 100644
index 468d535ac3..0000000000
@@ -1,33 +0,0 @@
-From 22e5a4c5d29ddf0856d7f68f5a613aec00e26168 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Tue, 7 Mar 2017 22:25:36 +0100
-Subject: [PATCH] Serial ioctl() workaround
-
-The ioctls.h of some architectures (notably xtensa) references structs from
-linux/serial.h. Make sure to include this header as well.
-
-Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct,
-but isn't actually referenced in modern kernels.
-
-Signed-off-by: Baruch Siach <[email protected]>
----
- Modules/termios.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Modules/termios.c b/Modules/termios.c
-index 57f30dc..a8c9855 100644
---- a/Modules/termios.c
-+++ b/Modules/termios.c
-@@ -16,7 +16,9 @@
-  * so this needs to be included first on that platform. */
- #include <termio.h>
- #endif
-+#include <linux/serial.h>
- #include <sys/ioctl.h>
-+#undef TIOCTTYGSTRUCT
- 
- /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
-  * MDTR, MRI, and MRTS (appearantly used internally by some things
--- 
-2.7.4
-

deleted file mode 100644
index fecf29f4d6..0000000000
@@ -1,35 +0,0 @@
-From 70049366ddf1fc9084bb02cf4459380976cdf8f7 Mon Sep 17 00:00:00 2001
-From: Christophe Vu-Brugier <[email protected]>
-Date: Tue, 7 Mar 2017 22:26:09 +0100
-Subject: [PATCH] Do not adjust the shebang of Python scripts for
- cross-compilation
-
-The copy_scripts() method in distutils copies the scripts listed in
-the setup file and adjusts the first line to refer to the current
-Python interpreter. When cross-compiling, this means that the adjusted
-shebang refers to the host Python interpreter.
-
-This patch modifies copy_scripts() to preserve the shebang when
-cross-compilation is detected.
-
-Signed-off-by: Christophe Vu-Brugier <[email protected]>
----
- Lib/distutils/command/build_scripts.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
-index 567df65..4922d50 100644
---- a/Lib/distutils/command/build_scripts.py
-+++ b/Lib/distutils/command/build_scripts.py
-@@ -89,7 +89,7 @@ class build_scripts (Command):
-                     adjust = 1
-                     post_interp = match.group(1) or ''
- 
--            if adjust:
-+            if adjust and not '_python_sysroot' in os.environ:
-                 log.info("copying and adjusting %s -> %s", script,
-                          self.build_dir)
-                 if not self.dry_run:
--- 
-2.7.4
-

105 lines not on this page · raw message

89 lines not on this page · raw message

92 lines not on this page · raw message

69 lines not on this page · raw message

73 lines not on this page · raw message

61 lines not on this page · raw message

92 lines not on this page · raw message

deleted file mode 100644
index 3ee77fec36..0000000000
@@ -1,32 +0,0 @@
-From 6761066addfb6028e183d7fe4322b283af18117f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:29:31 +0100
-Subject: [PATCH] Add an option to disable CJK codecs
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 2f5759a890..862c8ae516 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2851,6 +2851,12 @@ if test "$SQLITE3" = "no" ; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- fi
- 
-+AC_ARG_ENABLE(codecs-cjk,
-+	AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.11.0
-

deleted file mode 100644
index bad4ba68dc..0000000000
@@ -1,35 +0,0 @@
-From ecd8e926bd364d866f492df87d7c46d029445480 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:29:41 +0100
-Subject: [PATCH] Add an option to disable NIS
-
-NIS is not necessarily available in uClibc, so we need an option to
-not compile support for it.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 862c8ae516..354212fb16 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2857,6 +2857,12 @@ AC_ARG_ENABLE(codecs-cjk,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
-   	  fi])
- 
-+AC_ARG_ENABLE(nis,
-+	AS_HELP_STRING([--disable-nis], [disable NIS]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.11.0
-

deleted file mode 100644
index 687ea5027e..0000000000
@@ -1,32 +0,0 @@
-From dc99b7a0331fe75d70ccb87dc0877ac5bbba51ca Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:29:52 +0100
-Subject: [PATCH] Add an option to disable unicodedata
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 354212fb16..4e430d82b8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(unicodedata,
-+	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.11.0
-

87 lines not on this page · raw message

deleted file mode 100644
index d62408e4e9..0000000000
@@ -1,32 +0,0 @@
-From a0e56b96c3bfb04a5c8ecc0987cdd294d8ce116b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:30:22 +0100
-Subject: [PATCH] Add an option to disable the ssl module
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 361e8c120e..8fe47d8c37 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2863,6 +2863,12 @@ AC_ARG_ENABLE(nis,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(ssl,
-+	AS_HELP_STRING([--disable-ssl], [disable SSL]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
-+  	  fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
--- 
-2.11.0
-

deleted file mode 100644
index 5b89e8ef87..0000000000
@@ -1,32 +0,0 @@
-From d1236c6f4d8d893709fa36f751af47b8ad9055c1 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:30:33 +0100
-Subject: [PATCH] Add an option to disable the bz2 module
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 8fe47d8c37..85df7b1478 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
-   	  fi])
- 
-+AC_ARG_ENABLE(bz2,
-+       AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
-+         fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
--- 
-2.11.0
-

deleted file mode 100644
index 95da586e46..0000000000
@@ -1,32 +0,0 @@
-From a9c7314e069036f74b503dfaef261e5f45477b7e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:30:45 +0100
-Subject: [PATCH] Add an option to disable the zlib module
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 85df7b1478..3848b16b9f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(bz2,
-             DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
-          fi])
- 
-+AC_ARG_ENABLE(zlib,
-+       AS_HELP_STRING([--disable-zlib], [disable ZLIB]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib"
-+         fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
--- 
-2.11.0
-

55 lines not on this page · raw message

deleted file mode 100644
index 9768faf676..0000000000
@@ -1,32 +0,0 @@
-From 4ab280b8a7626de2565cf4ef6cf08a5c7326574b Mon Sep 17 00:00:00 2001
-From: Zoltan Gyarmati <[email protected]>
-Date: Tue, 7 Mar 2017 22:31:22 +0100
-Subject: [PATCH] Add an option to disable the ossaudiodev module
-
-Signed-off-by: Zoltan Gyarmati <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 3848b16b9f..6d19cdee95 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2927,6 +2927,12 @@ if test "$CURSES" = "no"; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
- fi
- 
-+AC_ARG_ENABLE(ossaudiodev,
-+       AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev"
-+         fi])
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
--- 
-2.11.0
-

deleted file mode 100644
index 82ef3a13f7..0000000000
@@ -1,32 +0,0 @@
-From 479bef8182c4f6b678a86820ccc06760ca60c286 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:33:02 +0100
-Subject: [PATCH] Add option to disable the hashlib module
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 6d19cdee95..ddccc79c2c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2869,6 +2869,12 @@ AC_ARG_ENABLE(ssl,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
-   	  fi])
- 
-+AC_ARG_ENABLE(hashlib,
-+	AS_HELP_STRING([--disable-hashlib], [disable hashlib]),
-+	[ if test "$enableval" = "no"; then
-+	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
-+	  fi])
-+
- AC_ARG_ENABLE(bz2,
-        AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
-        [ if test "$enableval" = "no"; then
--- 
-2.11.0
-

deleted file mode 100644
index 02b1315179..0000000000
@@ -1,32 +0,0 @@
-From abea92958b073dfbf0c78bcb31ce9cfc709c20ca Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 7 Mar 2017 22:33:55 +0100
-Subject: [PATCH] Add an option to disable readline module
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[Peter: update for 2.7.16]
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index ddccc79c2c..dae266326e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2875,6 +2875,12 @@ AC_ARG_ENABLE(hashlib,
- 	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
- 	  fi])
- 
-+AC_ARG_ENABLE(readline,
-+	AS_HELP_STRING([--disable-readline], [disable readline]),
-+	[ if test "$enableval" = "no"; then
-+	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
-+	  fi])
-+
- AC_ARG_ENABLE(bz2,
-        AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
-        [ if test "$enableval" = "no"; then
--- 
-2.11.0
-

deleted file mode 100644
index 8fe722bc6c..0000000000
@@ -1,37 +0,0 @@
-From d2bfa8805206db8c57c182094396d20a9d94bd8f Mon Sep 17 00:00:00 2001
-From: Samuel Cabrero <[email protected]>
-Date: Sat, 1 Apr 2017 09:31:52 +0200
-Subject: [PATCH] Override system locale and set to default when adding gcc
- paths
-
-Forces the use of the default locale in the function
-add_gcc_paths, which is called when cross compiling to add the
-include and library paths. This is necessary because otherwise
-the gcc output is localized and the output parsing fails, which
-results in no paths added and detect_modules not able to find
-any system library (eg. libz, libssl, etc.)
-
-[Thomas: patch taken from https://bugs.python.org/issue23767.]
-
-Signed-off-by: Samuel Cabrero <[email protected]>
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 8045a9b..c14f4ab 100644
---- a/setup.py
-+++ b/setup.py
-@@ -430,7 +430,7 @@ class PyBuildExt(build_ext):
-         tmpfile = os.path.join(self.build_temp, 'gccpaths')
-         if not os.path.exists(self.build_temp):
-             os.makedirs(self.build_temp)
--        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-+        ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-         is_gcc = False
-         in_incdirs = False
-         inc_dirs = []
--- 
-2.7.4
-

deleted file mode 100644
index 724e5e223a..0000000000
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_HOST_PYTHON
-	bool "host python"
-	help
-	  The python language interpreter. Host package.
-
-	  http://www.python.org/
-
-if BR2_PACKAGE_HOST_PYTHON
-
-config BR2_PACKAGE_HOST_PYTHON_SSL
-	bool "ssl"
-	select BR2_PACKAGE_HOST_OPENSSL
-	help
-	  _ssl module for host Python.
-
-endif

deleted file mode 100644
index f5e51d9638..0000000000
@@ -1,5 +0,0 @@
-# From https://www.python.org/downloads/release/python-2718/
-md5  fd6cc8ec0a78c44036f825e739f36e5a Python-2.7.18.tar.xz
-# Locally calculated
-sha256  b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43  Python-2.7.18.tar.xz
-sha256  de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23  LICENSE

302 lines not on this page · raw message

index 6bc3803a5c..cc1ed8f9d5 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_BACKPORTS_ABC
+	bool "python-backports-abc removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON
 	bool "python2.7 package removed"
 	select BR2_LEGACY

index ca2fb363e3..46e6b30cdf 100644
@@ -941,7 +941,6 @@ menu "External python modules"
 	source "package/python-avro/Config.in"
 	source "package/python-babel/Config.in"
 	source "package/python-backcall/Config.in"
-	source "package/python-backports-abc/Config.in"
 	source "package/python-backports-shutil-get-terminal-size/Config.in"
 	source "package/python-backports-ssl-match-hostname/Config.in"
 	source "package/python-bcrypt/Config.in"

deleted file mode 100644
index 43566279e8..0000000000
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_PYTHON_BACKPORTS_ABC
-	bool "python-backports-abc"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  A backport of recent additions to the 'collections.abc'
-	  module.
-
-	  https://pypi.python.org/pypi/backports_abc

deleted file mode 100644
index 4f4c9bd1fe..0000000000
@@ -1,5 +0,0 @@
-# md5 from https://pypi.python.org/pypi/backports_abc/json
-md5 7d1936ec183a3586290adf60f6f96764 backports_abc-0.5.tar.gz
-# Locally computed
-sha256  033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde  backports_abc-0.5.tar.gz
-sha256  0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca  LICENSE

deleted file mode 100644
index 66cea1703e..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-backports-abc
-#
-################################################################################
-
-PYTHON_BACKPORTS_ABC_VERSION = 0.5
-PYTHON_BACKPORTS_ABC_SOURCE = backports_abc-$(PYTHON_BACKPORTS_ABC_VERSION).tar.gz
-PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8
-PYTHON_BACKPORTS_ABC_LICENSE = Python-2.0
-PYTHON_BACKPORTS_ABC_LICENSE_FILES = LICENSE
-PYTHON_BACKPORTS_ABC_SETUP_TYPE = setuptools
-
-$(eval $(python-package))

index cc1ed8f9d5..89c095a388 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE
+	bool "python-backports-shutil-get-terminal-size removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_BACKPORTS_ABC
 	bool "python-backports-abc removed"
 	select BR2_LEGACY

index 1d1cf99898..2fd8d4d010 100644
@@ -143,7 +143,6 @@ N:	Andreas Ziegler <[email protected]>
 F:	package/mpd/
 
 N:	Andrey Smirnov <[email protected]>
-F:	package/python-backports-shutil-get-terminal-size/
 F:	package/python-decorator/
 F:	package/python-ipython-genutils/
 F:	package/python-pathlib2/

index 46e6b30cdf..fbfc876d89 100644
@@ -941,7 +941,6 @@ menu "External python modules"
 	source "package/python-avro/Config.in"
 	source "package/python-babel/Config.in"
 	source "package/python-backcall/Config.in"
-	source "package/python-backports-shutil-get-terminal-size/Config.in"
 	source "package/python-backports-ssl-match-hostname/Config.in"
 	source "package/python-bcrypt/Config.in"
 	source "package/python-beautifulsoup4/Config.in"

deleted file mode 100644
index 392e05a282..0000000000
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE
-	bool "python-backports-shutil-get-terminal-size"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  A backport of the get_terminal_size function from Python
-	  3.3's shutil.
-
-	  https://pypi.python.org/pypi/backports.shutil_get_terminal_size

deleted file mode 100644
index 40883a4e3b..0000000000
@@ -1,5 +0,0 @@
-# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json
-md5 03267762480bd86b50580dc19dff3c66 backports.shutil_get_terminal_size-1.0.0.tar.gz
-# Locally computed
-sha256  713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80  backports.shutil_get_terminal_size-1.0.0.tar.gz
-sha256  9edd99f8c339cddbfe36a9707e671fccf245b3e50b80eec0877dccec87a2dfe4  LICENSE

deleted file mode 100644
index 7c24b196f2..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-backports-shutil-get-terminal-size
-#
-################################################################################
-
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION = 1.0.0
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SOURCE = backports.shutil_get_terminal_size-$(PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION).tar.gz
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SITE = https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SETUP_TYPE = setuptools
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE = MIT
-PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))

index 89c095a388..10476a2adf 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME
+	bool "python-backports-ssl-match-hostname removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE
 	bool "python-backports-shutil-get-terminal-size removed"
 	select BR2_LEGACY

index 2fd8d4d010..c94a7831fc 100644
@@ -2243,7 +2243,6 @@ F:	package/lzop/
 F:	package/memtool/
 F:	package/mosquitto/
 F:	package/python-alsaaudio/
-F:	package/python-backports-ssl-match-hostname/
 F:	package/python-cached-property/
 F:	package/python-docker/
 F:	package/python-dockerpty/

index fbfc876d89..73f266504a 100644
@@ -941,7 +941,6 @@ menu "External python modules"
 	source "package/python-avro/Config.in"
 	source "package/python-babel/Config.in"
 	source "package/python-backcall/Config.in"
-	source "package/python-backports-ssl-match-hostname/Config.in"
 	source "package/python-bcrypt/Config.in"
 	source "package/python-beautifulsoup4/Config.in"
 	source "package/python-bidict/Config.in"

deleted file mode 100644
index 8e55191a9e..0000000000
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME
-	bool "python-backports-ssl-match-hostname"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  The ssl.match_hostname() function from Python 3.5.
-
-	  http://bitbucket.org/brandon/backports.ssl_match_hostname

deleted file mode 100644
index 145174cd5b..0000000000
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/backports.ssl_match_hostname/json
-md5	32d2f593af01a046bec3d2f5181a420a  backports.ssl_match_hostname-3.7.0.1.tar.gz
-sha256	bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2  backports.ssl_match_hostname-3.7.0.1.tar.gz
-# Locally computed sha256 checksums
-sha256	bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e  LICENSE.txt

deleted file mode 100644
index 300961662d..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-backports-ssl-match-hostname
-#
-################################################################################
-
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.7.0.1
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SOURCE = backports.ssl_match_hostname-$(PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION).tar.gz
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://files.pythonhosted.org/packages/ff/2b/8265224812912bc5b7a607c44bf7b027554e1b9775e9ee0de8032e3de4b2
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SETUP_TYPE = distutils
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE = Python-2.0
-PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = LICENSE.txt
-
-$(eval $(python-package))

index 10476a2adf..7e85e4cf63 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_FUTURES
+	bool "python-futures removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME
 	bool "python-backports-ssl-match-hostname removed"
 	select BR2_LEGACY

index c94a7831fc..d2ed22dac0 100644
@@ -436,7 +436,6 @@ F:	package/pulseaudio/
 F:	package/pure-ftpd/
 F:	package/python-couchdb/
 F:	package/python-cssutils/
-F:	package/python-futures/
 F:	package/python-mwclient/
 F:	package/python-mwscrape/
 F:	package/python-mwscrape2slob/

index 73f266504a..b18d298a1b 100644
@@ -1032,7 +1032,6 @@ menu "External python modules"
 	source "package/python-frozenlist/Config.in"
 	source "package/python-functools32/Config.in"
 	source "package/python-future/Config.in"
-	source "package/python-futures/Config.in"
 	source "package/python-git/Config.in"
 	source "package/python-gitdb2/Config.in"
 	source "package/python-gnupg/Config.in"

deleted file mode 100644
index 2eb40e93bd..0000000000
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PYTHON_FUTURES
-	bool "python-futures"
-	depends on BR2_PACKAGE_PYTHON # not needed for python3
-	help
-	  Backport of the concurrent.futures package from Python 3.2.
-
-	  https://github.com/agronholm/pythonfutures

deleted file mode 100644
index a4fbdf4fe9..0000000000
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/futures/json
-md5	b43a39ae1475e3fd6940f2b4f7214675  futures-3.3.0.tar.gz
-sha256	7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794  futures-3.3.0.tar.gz
-# Locally computed sha256 checksums
-sha256	a698bd5d441e4a16af6c992b8e80cbfa12755d72d910854fa1fb11d4deb0059a  LICENSE

deleted file mode 100644
index 0666948115..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-futures
-#
-################################################################################
-
-PYTHON_FUTURES_VERSION = 3.3.0
-PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz
-PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00
-PYTHON_FUTURES_SETUP_TYPE = setuptools
-PYTHON_FUTURES_LICENSE = BSD-2-Clause
-PYTHON_FUTURES_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))

index 7e85e4cf63..03ea14a512 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_ID3
+	bool "python-id3 removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_FUTURES
 	bool "python-futures removed"
 	select BR2_LEGACY

index d2ed22dac0..985f43b614 100644
@@ -729,7 +729,6 @@ F:	package/wireless-regdb/
 
 N:	Dominik Faessler <[email protected]>
 F:	package/logsurfer/
-F:	package/python-id3/
 
 N:	Doug Kehn <[email protected]>
 F:	package/nss-pam-ldapd/

index b18d298a1b..0ee1c8ddb4 100644
@@ -1049,7 +1049,6 @@ menu "External python modules"
 	source "package/python-hyperframe/Config.in"
 	source "package/python-hyperlink/Config.in"
 	source "package/python-ibmiotf/Config.in"
-	source "package/python-id3/Config.in"
 	source "package/python-idna/Config.in"
 	source "package/python-ifaddr/Config.in"
 	source "package/python-incremental/Config.in"

deleted file mode 100644
index 6ddfd541bd..0000000000
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYTHON_ID3
-	bool "python-id3"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  This module allows one to read and manipulate so-called ID3
-	  informational tags on MP3 files through an object-oriented
-	  Python interface.
-
-	  http://id3-py.sourceforge.net/

deleted file mode 100644
index c83b34a2d9..0000000000
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256  ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022  id3-py_1.2.tar.gz
-sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING

deleted file mode 100644
index d4cdded00c..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-id3
-#
-################################################################################
-
-PYTHON_ID3_VERSION = 1.2
-PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
-PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION)
-PYTHON_ID3_SETUP_TYPE = distutils
-PYTHON_ID3_LICENSE = GPL-2.0+
-PYTHON_ID3_LICENSE_FILES = COPYING
-
-$(eval $(python-package))

index 03ea14a512..c78fb20756 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_IPADDR
+	bool "python-ipaddr removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_ID3
 	bool "python-id3 removed"
 	select BR2_LEGACY

index 985f43b614..c74bb3ae38 100644
@@ -2248,7 +2248,6 @@ F:	package/python-docker-pycreds/
 F:	package/python-enum/
 F:	package/python-enum34/
 F:	package/python-functools32/
-F:	package/python-ipaddr/
 F:	package/python-pam/
 F:	package/python-psutil/
 F:	package/python-request-id/

index 0ee1c8ddb4..611a8f6aa8 100644
@@ -1058,7 +1058,6 @@ menu "External python modules"
 	source "package/python-iniparse/Config.in"
 	source "package/python-intelhex/Config.in"
 	source "package/python-iowait/Config.in"
-	source "package/python-ipaddr/Config.in"
 	source "package/python-ipaddress/Config.in"
 	source "package/python-ipdb/Config.in"
 	source "package/python-iptables/Config.in"

deleted file mode 100644
index 57279273f9..0000000000
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYTHON_IPADDR
-	bool "python-ipaddr"
-	depends on BR2_PACKAGE_PYTHON # included since python3.3
-	help
-	  An IPv4/IPv6 manipulation library in Python. This library is
-	  used to create/poke/manipulate IPv4 and IPv6 addresses and
-	  prefixes.
-
-	  https://github.com/google/ipaddr-py

deleted file mode 100644
index d9963a2933..0000000000
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/ipaddr/json
-md5	f88353e40dec06410acfa075b8209b27  ipaddr-2.2.0.tar.gz
-sha256	4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6  ipaddr-2.2.0.tar.gz
-# Locally computed sha256 checksums
-sha256	175b3b509d5c840db72ad8c22d22a690d15c67b317f34de8a8bb0a66059e8215  COPYING

deleted file mode 100644
index 9a5d147533..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-ipaddr
-#
-################################################################################
-
-PYTHON_IPADDR_VERSION = 2.2.0
-PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz
-PYTHON_IPADDR_SITE = https://files.pythonhosted.org/packages/9d/a7/1b39a16cb90dfe491f57e1cab3103a15d4e8dd9a150872744f531b1106c1
-PYTHON_IPADDR_SETUP_TYPE = distutils
-PYTHON_IPADDR_LICENSE = Apache-2.0
-PYTHON_IPADDR_LICENSE_FILES = COPYING
-
-$(eval $(python-package))

index c78fb20756..14b26408fe 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_IPADDRESS
+	bool "python-ipaddress removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_IPADDR
 	bool "python-ipaddr removed"
 	select BR2_LEGACY

index 611a8f6aa8..50c0e13510 100644
@@ -1058,7 +1058,6 @@ menu "External python modules"
 	source "package/python-iniparse/Config.in"
 	source "package/python-intelhex/Config.in"
 	source "package/python-iowait/Config.in"
-	source "package/python-ipaddress/Config.in"
 	source "package/python-ipdb/Config.in"
 	source "package/python-iptables/Config.in"
 	source "package/python-ipy/Config.in"

deleted file mode 100644
index b2b9f0b1c3..0000000000
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PYTHON_IPADDRESS
-	bool "python-ipaddress"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  Python 3.3's ipaddress for older Python versions.
-
-	  https://github.com/phihag/ipaddress

deleted file mode 100644
index e61835e192..0000000000
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/ipaddress/json
-md5	aaee67a8026782af1831148beb0d9060  ipaddress-1.0.23.tar.gz
-sha256	b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2  ipaddress-1.0.23.tar.gz
-# Locally computed sha256 checksums
-sha256	38675419eb4a79ec616396d70f1254b3a433fb7088fb3f4cc9b6c0bcdcec6162  LICENSE

deleted file mode 100644
index 8f1ad5ffc7..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-ipaddress
-#
-################################################################################
-
-PYTHON_IPADDRESS_VERSION = 1.0.23
-PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz
-PYTHON_IPADDRESS_SITE = https://files.pythonhosted.org/packages/b9/9a/3e9da40ea28b8210dd6504d3fe9fe7e013b62bf45902b458d1cdc3c34ed9
-PYTHON_IPADDRESS_LICENSE = Python-2.0
-PYTHON_IPADDRESS_LICENSE_FILES = LICENSE
-PYTHON_IPADDRESS_SETUP_TYPE = setuptools
-
-$(eval $(python-package))

index 14b26408fe..f6607deeeb 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_MAD
+	bool "python-mad removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_IPADDRESS
 	bool "python-ipaddress removed"
 	select BR2_LEGACY

index c74bb3ae38..fe28772d8b 100644
@@ -2805,7 +2805,6 @@ F:	package/python3/
 F:	package/python-augeas/
 F:	package/python-flask-expects-json/
 F:	package/python-git/
-F:	package/python-mad/
 F:	package/python-serial/
 F:	package/python-unittest-xml-reporting/
 F:	package/qextserialport/

index 50c0e13510..d5c46ef997 100644
@@ -1086,7 +1086,6 @@ menu "External python modules"
 	source "package/python-lxml/Config.in"
 	source "package/python-m2crypto/Config.in"
 	source "package/python-m2r/Config.in"
-	source "package/python-mad/Config.in"
 	source "package/python-mako/Config.in"
 	source "package/python-markdown/Config.in"
 	source "package/python-markdown2/Config.in"

deleted file mode 100644
index 25354213d6..0000000000
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYTHON_MAD
-	bool "python-mad"
-	depends on BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_LIBMAD
-	help
-	  python-mad is a Python binding for the MAD library, a
-	  high-quality integer-only MPEG decoder.
-
-	  http://spacepants.org/src/pymad/

deleted file mode 100644
index 7b19ae5a44..0000000000
@@ -1,3 +0,0 @@
-# locally computed
-sha256  1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522  pymad-0.6.tar.gz
-sha256  d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING

deleted file mode 100644
index a22214876f..0000000000
@@ -1,29 +0,0 @@
-################################################################################
-#
-# python-mad
-#
-################################################################################
-
-PYTHON_MAD_VERSION = 0.6
-PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz
-PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download
-PYTHON_MAD_SETUP_TYPE = distutils
-PYTHON_MAD_LICENSE = GPL-2.0+
-PYTHON_MAD_LICENSE_FILES = COPYING
-
-PYTHON_MAD_DEPENDENCIES = libmad
-
-ifeq ($(BR2_ENDIAN),"LITTLE")
-PYTHON_MAD_ENDIAN = little
-else
-PYTHON_MAD_ENDIAN = big
-endif
-
-define PYTHON_MAD_CONFIGURE_CMDS
-	echo "endian = $(PYTHON_MAD_ENDIAN)" > $(@D)/Setup
-	echo "mad_libs = mad" >> $(@D)/Setup
-	echo "mad_lib_dir = $(STAGING_DIR)/usr/lib" >> $(@D)/Setup
-	echo "mad_include_dir = $(STAGING_DIR)/usr/include" >> $(@D)/Setup
-endef
-
-$(eval $(python-package))

index f6607deeeb..80adf521f8 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_NFC
+	bool "python-nfc removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_MAD
 	bool "python-mad removed"
 	select BR2_LEGACY

index fe28772d8b..7b38d3c0f7 100644
@@ -2598,7 +2598,6 @@ F:	package/nanocom/
 F:	package/neard/
 F:	package/neardal/
 F:	package/owl-linux/
-F:	package/python-nfc/
 F:	package/rapidjson/
 F:	package/sconeserver/
 F:	package/sound-theme-borealis/

index d5c46ef997..8dc91becb0 100644
@@ -1110,7 +1110,6 @@ menu "External python modules"
 	source "package/python-netifaces/Config.in"
 	source "package/python-networkmanager/Config.in"
 	source "package/python-networkx/Config.in"
-	source "package/python-nfc/Config.in"
 	source "package/python-numpy/Config.in"
 	source "package/python-oauthlib/Config.in"
 	source "package/python-opcua-asyncio/Config.in"

deleted file mode 100644
index 7008723f60..0000000000
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_PYTHON_NFC
-	bool "python-nfc"
-	depends on BR2_PACKAGE_PYTHON
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	help
-	  Python module for near field communication.
-
-	  https://launchpad.net/nfcpy
-
-comment "python-nfc needs a toolchain w/ threads, gcc >= 4.9"
-	depends on BR2_PACKAGE_PYTHON
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9

deleted file mode 100644
index 6514973f53..0000000000
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256	7ff9265e393e9e70173ecef5a1f9124e67d3b6e481c2dc3a9537b6a769ebe16f	python-nfc-0.13.5.tar.gz
-sha256	0dc4b0a3362f197e250604567a6b4eb16bbc34c186425401e2201a193a82549f	LICENSE

deleted file mode 100644
index f5417410c9..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-nfc
-#
-################################################################################
-
-PYTHON_NFC_VERSION = 0.13.5
-PYTHON_NFC_SITE = $(call github,nfcpy,nfcpy,v$(PYTHON_NFC_VERSION))
-PYTHON_NFC_DEPENDENCIES = libusb libusb-compat
-PYTHON_NFC_SETUP_TYPE = setuptools
-PYTHON_NFC_LICENSE = EUPL-1.1+
-PYTHON_NFC_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))

index 80adf521f8..386f94e72b 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_PAM
+	bool "python-pam removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_NFC
 	bool "python-nfc removed"
 	select BR2_LEGACY

index 7b38d3c0f7..a6ea3793ea 100644
@@ -2248,7 +2248,6 @@ F:	package/python-docker-pycreds/
 F:	package/python-enum/
 F:	package/python-enum34/
 F:	package/python-functools32/
-F:	package/python-pam/
 F:	package/python-psutil/
 F:	package/python-request-id/
 F:	package/python-semver/

index 8dc91becb0..73e8901a1d 100644
@@ -1115,7 +1115,6 @@ menu "External python modules"
 	source "package/python-opcua-asyncio/Config.in"
 	source "package/python-packaging/Config.in"
 	source "package/python-paho-mqtt/Config.in"
-	source "package/python-pam/Config.in"
 	source "package/python-paramiko/Config.in"
 	source "package/python-parso/Config.in"
 	source "package/python-passlib/Config.in"

deleted file mode 100644
index dd4f9610c7..0000000000
@@ -1,25 +0,0 @@
-[PATCH] fix two bugs in the PAM object deallocation
-
-Fixes https://bugzilla.redhat.com/show_bug.cgi?id=658955
-
-Downloaded from:
-http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-dealloc.patch
-
-Signed-off-by: Peter Korsgaard <[email protected]>
-diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c
---- PyPAM-0.5.0/PAMmodule.c.dealloc	2011-01-17 22:48:22.000000000 +0100
-+++ PyPAM-0.5.0/PAMmodule.c	2011-01-18 21:24:59.000000000 +0100
-@@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s
-     free(self->service);
-     free(self->user);
-     free(self->conv);
--    pam_end(self->pamh, PAM_SUCCESS);
-+    if (self->pamh)
-+        pam_end(self->pamh, PAM_SUCCESS);
-     dlclose(self->dlh2);
-     dlclose(self->dlh1);
--    PyMem_DEL(self);
-+    PyObject_Del(self);
- }
- 
- static PyObject * PyPAM_getattr(PyPAMObject *self, char *name)

68 lines not on this page · raw message

136 lines not on this page · raw message

deleted file mode 100644
index 92ba105ebf..0000000000
@@ -1,16 +0,0 @@
-comment "python-pam needs a toolchain w/ wchar, locale, dynamic library"
-	depends on BR2_PACKAGE_PYTHON
-	depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
-
-config BR2_PACKAGE_PYTHON_PAM
-	bool "python-pam"
-	depends on BR2_PACKAGE_PYTHON # C extension not compatible with python3
-	depends on BR2_ENABLE_LOCALE # linux-pam
-	depends on BR2_USE_WCHAR # linux-pam
-	depends on BR2_USE_MMU # linux-pam
-	depends on !BR2_STATIC_LIBS # linux-pam
-	select BR2_PACKAGE_LINUX_PAM
-	help
-	  PAM (Pluggable Authentication Module) bindings for Python.
-
-	  https://admin.fedoraproject.org/pkgdb/package/PyPAM/

deleted file mode 100644
index 303455ae2f..0000000000
@@ -1,3 +0,0 @@
-# locally computed
-sha256  796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a  PyPAM-0.5.0.tar.gz
-sha256  ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532  COPYING

deleted file mode 100644
index 943e01dd64..0000000000
@@ -1,16 +0,0 @@
-################################################################################
-#
-# python-pam
-#
-################################################################################
-
-PYTHON_PAM_VERSION = 0.5.0
-PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz
-# pangalactic.org gone
-PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871
-PYTHON_PAM_SETUP_TYPE = distutils
-PYTHON_PAM_LICENSE = LGPL-2.1
-PYTHON_PAM_LICENSE_FILES = COPYING
-PYTHON_PAM_DEPENDENCIES = linux-pam
-
-$(eval $(python-package))

index 386f94e72b..74317a2d7c 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_PATHLIB2
+	bool "python-pathlib2 removed"
+	select BR2_LEGACY
+	help
+	  Package was removed together with python 2.7 support.
+
 config BR2_PACKAGE_PYTHON_PAM
 	bool "python-pam removed"
 	select BR2_LEGACY

index a6ea3793ea..07f9304766 100644
@@ -145,7 +145,6 @@ F:	package/mpd/
 N:	Andrey Smirnov <[email protected]>
 F:	package/python-decorator/
 F:	package/python-ipython-genutils/
-F:	package/python-pathlib2/
 F:	package/python-pickleshare/
 F:	package/python-scandir/
 F:	package/python-simplegeneric/

index 73e8901a1d..3c55dec6c5 100644
@@ -1118,7 +1118,6 @@ menu "External python modules"
 	source "package/python-paramiko/Config.in"
 	source "package/python-parso/Config.in"
 	source "package/python-passlib/Config.in"
-	source "package/python-pathlib2/Config.in"
 	source "package/python-pathpy/Config.in"
 	source "package/python-pathtools/Config.in"
 	source "package/python-pathvalidate/Config.in"

deleted file mode 100644
index e28de4c12e..0000000000
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_PYTHON_PATHLIB2
-	bool "python-pathlib2"
-	depends on BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON_SIX # runtime
-	help
-	  Object-oriented filesystem paths.
-
-	  The goal of pathlib2 is to provide a backport of standard
-	  pathlib module which tracks the standard library module, so
-	  all the newest features of the standard pathlib can be used
-	  also on older Python versions.
-
-	  https://pypi.python.org/pypi/pathlib2

deleted file mode 100644
index ebd197b62e..0000000000
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/pathlib2/json
-md5  e50a0cf94e406c5110b3aed535626e9e  pathlib2-2.3.6.tar.gz
-sha256  7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f  pathlib2-2.3.6.tar.gz
-# Locally computed sha256 checksums
-sha256  861f813004a151ac77024ad445794653809ddf8a7572aee7bab18d11df2ba1c6  LICENSE.rst

deleted file mode 100644
index 4bcfea78fb..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-pathlib2
-#
-################################################################################
-
-PYTHON_PATHLIB2_VERSION = 2.3.6
-PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz
-PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/df/16/e9d6bcf1aed52a55bc1696324ab22586716053b3e97b85266e0f3ad36bae
-PYTHON_PATHLIB2_LICENSE = MIT
-PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst
-PYTHON_PATHLIB2_SETUP_TYPE = setuptools
-
-$(eval $(python-package))