[Buildroot] [PATCH 1/5] package/python3-pycryptodomex: drop host package

[Buildroot] [PATCH 1/5] package/python3-pycryptodomex: drop host package

[Peter Korsgaard]

Now that host-python2 is gone, the custom python3 variant can be dropped.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 boot/optee-os/optee-os.mk                     |  2 +-
 .../python-pycryptodomex.mk                   |  1 -
 .../python3-pycryptodomex.hash                |  1 -
 .../python3-pycryptodomex.mk                  | 19 -------------------
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 120000 package/python3-pycryptodomex/python3-pycryptodomex.hash
 delete mode 100644 package/python3-pycryptodomex/python3-pycryptodomex.mk

diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
index 03ce08ffb2..2884b48513 100644
--- a/boot/optee-os/optee-os.mk
+++ b/boot/optee-os/optee-os.mk
@@ -21,7 +21,7 @@ else
 OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION))
 endif
 
-OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python3-pycryptodomex host-python3-pyelftools
+OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools
 
 # On 64bit targets, OP-TEE OS can be built in 32bit mode, or
 # can be built in 64bit mode and support 32bit and 64bit
diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk
index 92780327a1..d752122550 100644
--- a/package/python-pycryptodomex/python-pycryptodomex.mk
+++ b/package/python-pycryptodomex/python-pycryptodomex.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk
 PYTHON_PYCRYPTODOMEX_VERSION = 3.13.0
 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz
 PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619
diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.hash b/package/python3-pycryptodomex/python3-pycryptodomex.hash
deleted file mode 120000
index 0c6761d8a4..0000000000
--- a/package/python3-pycryptodomex/python3-pycryptodomex.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-pycryptodomex/python-pycryptodomex.hash
\ No newline at end of file
diff --git a/package/python3-pycryptodomex/python3-pycryptodomex.mk b/package/python3-pycryptodomex/python3-pycryptodomex.mk
deleted file mode 100644
index 06a46cdf63..0000000000
--- a/package/python3-pycryptodomex/python3-pycryptodomex.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-#
-# python3-pycryptodomex
-#
-################################################################################
-
-# Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk
-PYTHON3_PYCRYPTODOMEX_VERSION = 3.13.0
-PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz
-PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/7a/21/f399ba8dfd6e40eee444151af3237af22788b8b16077c75ec0419125f619
-PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools
-PYTHON3_PYCRYPTODOMEX_LICENSE = \
-	BSD-2-Clause, \
-	Public Domain (pycrypto original code)
-PYTHON3_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto
-HOST_PYTHON3_PYCRYPTODOMEX_DL_SUBDIR = python-pycryptodomex
-HOST_PYTHON3_PYCRYPTODOMEX_NEEDS_HOST_PYTHON = python3
-
-$(eval $(host-python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/5] boot/uboot: drop host-python2 support

[Peter Korsgaard]

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

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy     |  6 ++++++
 boot/uboot/Config.in | 28 +++-------------------------
 boot/uboot/uboot.mk  |  8 +-------
 3 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 2b1fd48de5..0794813a97 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_TARGET_UBOOT_NEEDS_PYTHON2
+	bool "host-python 2.7 support for U-Boot was removed"
+	select BR2_LEGACY
+	help
+	  Option was removed together with python 2.7 support.
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
 	bool "gst1-plugins-bad plugin libmms was removed"
 	depends on BR2_USE_WCHAR
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 1fd4dede92..953c36135e 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -143,45 +143,23 @@ config BR2_TARGET_UBOOT_NEEDS_DTC
 	  Select this option if your U-Boot board configuration
 	  requires the Device Tree compiler to be available.
 
-config BR2_TARGET_UBOOT_NEEDS_PYTHON
-	bool
-
-choice
-	bool "U-Boot needs host Python"
-
-config BR2_TARGET_UBOOT_NEEDS_PYTHON_NONE
-	bool "no"
-	depends on !BR2_TARGET_UBOOT_NEEDS_PYTHON
-	help
-	  Select this option if U-Boot does not need any
-	  host python to build.
-
-config BR2_TARGET_UBOOT_NEEDS_PYTHON2
-	bool "python 2.x"
-	help
-	  Select this option if U-Boot needs a host Python 2.x
-	  interpreter. This is the case for some U-Boot
-	  configurations, prior to U-Boot 2020.01.
-
 config BR2_TARGET_UBOOT_NEEDS_PYTHON3
-	bool "python 3.x"
+	bool "U-Boot needs host python 3.x"
 	help
 	  Select this option if U-Boot needs a host Python 3.x
 	  interpreter. This is the case for some U-Boot
 	  configurations, after U-Boot 2020.01.
 
-endchoice
-
 config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT
 	bool "U-Boot needs pylibfdt"
-	select BR2_TARGET_UBOOT_NEEDS_PYTHON
+	select BR2_TARGET_UBOOT_NEEDS_PYTHON3
 	help
 	  Select this option if your U-Boot board configuration
 	  requires the Python libfdt library to be available.
 
 config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS
 	bool "U-Boot needs pyelftools"
-	select BR2_TARGET_UBOOT_NEEDS_PYTHON
+	select BR2_TARGET_UBOOT_NEEDS_PYTHON3
 	help
 	  Select this option if your U-Boot board configuration
 	  requires the Python pyelftools library to be available.
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index d05b9bb479..9e227fed91 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -207,9 +207,7 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
 UBOOT_DEPENDENCIES += host-dtc
 endif
 
-ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y)
-UBOOT_DEPENDENCIES += host-python host-python-setuptools
-else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
 UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools
 endif
 
@@ -218,12 +216,8 @@ UBOOT_DEPENDENCIES += host-swig
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y)
-ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y)
-UBOOT_DEPENDENCIES += host-python-pyelftools
-else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
 UBOOT_DEPENDENCIES += host-python3-pyelftools
 endif
-endif
 
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y)
 UBOOT_DEPENDENCIES += host-openssl
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/5] boot/uboot: drop host-python2 support

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > host-python2 is gone, so drop the _NEEDS_PYTHON2 logic.
 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/5] package/python3-pyelftools: drop host package

[Peter Korsgaard]

Now that host-python2 is gone, the custom python3 variant can be dropped.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 boot/optee-os/optee-os.mk                       |  2 +-
 boot/uboot/uboot.mk                             |  2 +-
 package/python-pyelftools/python-pyelftools.mk  |  1 -
 .../python3-pyelftools/python3-pyelftools.hash  |  1 -
 .../python3-pyelftools/python3-pyelftools.mk    | 17 -----------------
 5 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 120000 package/python3-pyelftools/python3-pyelftools.hash
 delete mode 100644 package/python3-pyelftools/python3-pyelftools.mk

diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
index 2884b48513..166b5e693c 100644
--- a/boot/optee-os/optee-os.mk
+++ b/boot/optee-os/optee-os.mk
@@ -21,7 +21,7 @@ else
 OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION))
 endif
 
-OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python3-pyelftools
+OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools
 
 # On 64bit targets, OP-TEE OS can be built in 32bit mode, or
 # can be built in 64bit mode and support 32bit and 64bit
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 9e227fed91..9e569906ce 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -216,7 +216,7 @@ UBOOT_DEPENDENCIES += host-swig
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y)
-UBOOT_DEPENDENCIES += host-python3-pyelftools
+UBOOT_DEPENDENCIES += host-python-pyelftools
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y)
diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk
index 3ae0a4ffc2..5bfdcd33ae 100644
--- a/package/python-pyelftools/python-pyelftools.mk
+++ b/package/python-pyelftools/python-pyelftools.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-pyelftools/python3-pyelftools.mk
 PYTHON_PYELFTOOLS_VERSION = 0.27
 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz
 PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0
diff --git a/package/python3-pyelftools/python3-pyelftools.hash b/package/python3-pyelftools/python3-pyelftools.hash
deleted file mode 120000
index e8eebeda9f..0000000000
--- a/package/python3-pyelftools/python3-pyelftools.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-pyelftools/python-pyelftools.hash
\ No newline at end of file
diff --git a/package/python3-pyelftools/python3-pyelftools.mk b/package/python3-pyelftools/python3-pyelftools.mk
deleted file mode 100644
index 3d21d3040e..0000000000
--- a/package/python3-pyelftools/python3-pyelftools.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# python3-pyelftools
-#
-################################################################################
-
-# Please keep in sync with package/python-pyelftools/python-pyelftools.mk
-PYTHON3_PYELFTOOLS_VERSION = 0.27
-PYTHON3_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON3_PYELFTOOLS_VERSION).tar.gz
-PYTHON3_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0
-PYTHON3_PYELFTOOLS_LICENSE = Public domain
-PYTHON3_PYELFTOOLS_LICENSE_FILES = LICENSE
-PYTHON3_PYELFTOOLS_SETUP_TYPE = setuptools
-HOST_PYTHON3_PYELFTOOLS_DL_SUBDIR = python-pyelftools
-HOST_PYTHON3_PYELFTOOLS_NEEDS_HOST_PYTHON = python3
-
-$(eval $(host-python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/5] package/python3-pyelftools: drop host package

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > Now that host-python2 is gone, the custom python3 variant can be dropped.
 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 4/5] package/python3-regex: drop host package

[Peter Korsgaard]

Now that host-python2 is gone, the custom python3 variant can be dropped and
instead host support added to python-regex.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/mongodb/mongodb.mk               |  2 +-
 package/python-regex/python-regex.mk     |  1 +
 package/python3-regex/python3-regex.hash |  1 -
 package/python3-regex/python3-regex.mk   | 16 ----------------
 4 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 120000 package/python3-regex/python3-regex.hash
 delete mode 100644 package/python3-regex/python3-regex.mk

diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk
index e2a58a5f4e..9f6c7d31b8 100644
--- a/package/mongodb/mongodb.mk
+++ b/package/mongodb/mongodb.mk
@@ -19,7 +19,7 @@ MONGODB_DEPENDENCIES = \
 	host-python-cheetah \
 	host-python-psutil \
 	host-python-pyyaml \
-	host-python3-regex \
+	host-python-regex \
 	host-python-requests \
 	host-scons \
 	pcre \
diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk
index c46c4d1614..a90fd579ac 100644
--- a/package/python-regex/python-regex.mk
+++ b/package/python-regex/python-regex.mk
@@ -12,3 +12,4 @@ PYTHON_REGEX_SETUP_TYPE = setuptools
 PYTHON_REGEX_LICENSE = CNRI-Python
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/package/python3-regex/python3-regex.hash b/package/python3-regex/python3-regex.hash
deleted file mode 120000
index 274f4dc277..0000000000
--- a/package/python3-regex/python3-regex.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-regex/python-regex.hash
\ No newline at end of file
diff --git a/package/python3-regex/python3-regex.mk b/package/python3-regex/python3-regex.mk
deleted file mode 100644
index 0b71768e9d..0000000000
--- a/package/python3-regex/python3-regex.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# python3-regex
-#
-################################################################################
-
-# Please keep in sync with package/python-regex/python-regex.mk
-PYTHON3_REGEX_VERSION = 2021.4.4
-PYTHON3_REGEX_SOURCE = regex-$(PYTHON3_REGEX_VERSION).tar.gz
-PYTHON3_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f
-PYTHON3_REGEX_SETUP_TYPE = setuptools
-PYTHON3_REGEX_LICENSE = CNRI-Python
-HOST_PYTHON3_REGEX_DL_SUBDIR = python-regex
-HOST_PYTHON3_REGEX_NEEDS_HOST_PYTHON = python3
-
-$(eval $(host-python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/5] package/python3-regex: drop host package

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > Now that host-python2 is gone, the custom python3 variant can be dropped and
 > instead host support added to python-regex.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 5/5] package/python3-six: drop host package

[Peter Korsgaard]

Now that host-python2 is gone, the custom python3 variant can be dropped.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/gnuradio/gnuradio.mk         |  2 +-
 package/python-six/python-six.mk     |  1 -
 package/python3-six/python3-six.hash |  1 -
 package/python3-six/python3-six.mk   | 17 -----------------
 4 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 120000 package/python3-six/python3-six.hash
 delete mode 100644 package/python3-six/python3-six.mk

diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index 417a51e067..49e3b95191 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -15,7 +15,7 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO
 GNURADIO_DEPENDENCIES = \
 	host-python3 \
 	host-python-mako \
-	host-python3-six \
+	host-python-six \
 	host-swig \
 	boost \
 	log4cpp \
diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk
index 41ef41d0ba..9e3e5fcf50 100644
--- a/package/python-six/python-six.mk
+++ b/package/python-six/python-six.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-six/python3-six.mk
 PYTHON_SIX_VERSION = 1.16.0
 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz
 PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e
diff --git a/package/python3-six/python3-six.hash b/package/python3-six/python3-six.hash
deleted file mode 120000
index ed8cb89a6b..0000000000
--- a/package/python3-six/python3-six.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-six/python-six.hash
\ No newline at end of file
diff --git a/package/python3-six/python3-six.mk b/package/python3-six/python3-six.mk
deleted file mode 100644
index ee9dc818ee..0000000000
--- a/package/python3-six/python3-six.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# python3-six
-#
-################################################################################
-
-# Please keep in sync with package/python-six/python-six.mk
-PYTHON3_SIX_VERSION = 1.16.0
-PYTHON3_SIX_SOURCE = six-$(PYTHON3_SIX_VERSION).tar.gz
-PYTHON3_SIX_SITE = https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e
-PYTHON3_SIX_SETUP_TYPE = setuptools
-PYTHON3_SIX_LICENSE = MIT
-PYTHON3_SIX_LICENSE_FILES = LICENSE
-HOST_PYTHON3_SIX_DL_SUBDIR = python-six
-HOST_PYTHON3_SIX_NEEDS_HOST_PYTHON = python3
-
-$(eval $(host-python-package))
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 5/5] package/python3-six: drop host package

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > Now that host-python2 is gone, the custom python3 variant can be dropped.
 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/5] package/python3-pycryptodomex: drop host package

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > Now that host-python2 is gone, the custom python3 variant can be dropped.
 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot