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

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

[Peter Korsgaard]

Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host
variant) dropped the dependency on host-python3-cffi, so it is now unused.
Drop it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-cffi/python-cffi.mk     |  1 -
 package/python3-cffi/python3-cffi.hash |  1 -
 package/python3-cffi/python3-cffi.mk   | 29 --------------------------
 3 files changed, 31 deletions(-)
 delete mode 120000 package/python3-cffi/python3-cffi.hash
 delete mode 100644 package/python3-cffi/python3-cffi.mk

diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk
index b14dce8225..83a21cb75a 100644
--- a/package/python-cffi/python-cffi.mk
+++ b/package/python-cffi/python-cffi.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-cffi/python3-cffi.mk
 PYTHON_CFFI_VERSION = 1.15.0
 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz
 PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a
diff --git a/package/python3-cffi/python3-cffi.hash b/package/python3-cffi/python3-cffi.hash
deleted file mode 120000
index 1f98d8df9c..0000000000
--- a/package/python3-cffi/python3-cffi.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-cffi/python-cffi.hash
\ No newline at end of file
diff --git a/package/python3-cffi/python3-cffi.mk b/package/python3-cffi/python3-cffi.mk
deleted file mode 100644
index 2770eda93e..0000000000
--- a/package/python3-cffi/python3-cffi.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-#
-# python3-cffi
-#
-################################################################################
-
-# Please keep in sync with package/python-cffi/python-cffi.mk
-PYTHON3_CFFI_VERSION = 1.15.0
-PYTHON3_CFFI_SOURCE = cffi-$(PYTHON3_CFFI_VERSION).tar.gz
-PYTHON3_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a
-PYTHON3_CFFI_SETUP_TYPE = setuptools
-PYTHON3_CFFI_LICENSE = MIT
-PYTHON3_CFFI_LICENSE_FILES = LICENSE
-
-# This host package uses pkg-config to find libffi, so we have to
-# provide the proper hints for pkg-config to behave properly for host
-# packages.
-HOST_PYTHON3_CFFI_ENV = \
-	PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
-	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
-	PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-	PKG_CONFIG_SYSROOT_DIR="/" \
-	PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
-HOST_PYTHON3_CFFI_DEPENDENCIES = host-pkgconf host-python3-pycparser host-libffi
-
-HOST_PYTHON3_CFFI_DL_SUBDIR = python-cffi
-HOST_PYTHON3_CFFI_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] package/python3-cheetah: 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/mongodb/mongodb.mk                   |  2 +-
 package/python-cheetah/python-cheetah.mk     |  1 -
 package/python3-cheetah/python3-cheetah.hash |  1 -
 package/python3-cheetah/python3-cheetah.mk   | 18 ------------------
 4 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 120000 package/python3-cheetah/python3-cheetah.hash
 delete mode 100644 package/python3-cheetah/python3-cheetah.mk

diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk
index 311b9de14e..2a5e00be79 100644
--- a/package/mongodb/mongodb.mk
+++ b/package/mongodb/mongodb.mk
@@ -16,7 +16,7 @@ MONGODB_SELINUX_MODULES = mongodb
 
 MONGODB_DEPENDENCIES = \
 	boost \
-	host-python3-cheetah \
+	host-python-cheetah \
 	host-python3-psutil \
 	host-python-pyyaml \
 	host-python3-regex \
diff --git a/package/python-cheetah/python-cheetah.mk b/package/python-cheetah/python-cheetah.mk
index 02877e03c4..92688f6ced 100644
--- a/package/python-cheetah/python-cheetah.mk
+++ b/package/python-cheetah/python-cheetah.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-cheetah/python3-cheetah.mk
 PYTHON_CHEETAH_VERSION = 3.2.6.post2
 PYTHON_CHEETAH_SOURCE = Cheetah3-$(PYTHON_CHEETAH_VERSION).tar.gz
 PYTHON_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418
diff --git a/package/python3-cheetah/python3-cheetah.hash b/package/python3-cheetah/python3-cheetah.hash
deleted file mode 120000
index c29a76ea80..0000000000
--- a/package/python3-cheetah/python3-cheetah.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-cheetah/python-cheetah.hash
\ No newline at end of file
diff --git a/package/python3-cheetah/python3-cheetah.mk b/package/python3-cheetah/python3-cheetah.mk
deleted file mode 100644
index 93d16201aa..0000000000
--- a/package/python3-cheetah/python3-cheetah.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-#
-# python3-cheetah
-#
-################################################################################
-
-# Please keep in sync with
-# package/python-cheetah/python-cheetah.mk
-PYTHON3_CHEETAH_VERSION = 3.2.6.post2
-PYTHON3_CHEETAH_SOURCE = Cheetah3-$(PYTHON3_CHEETAH_VERSION).tar.gz
-PYTHON3_CHEETAH_SITE = https://files.pythonhosted.org/packages/c0/97/c3fa47e223207e6ca6b501a954c5c959ed3e99f2a1ceec9918238ce38418
-PYTHON3_CHEETAH_LICENSE = MIT
-PYTHON3_CHEETAH_LICENSE_FILES = LICENSE
-PYTHON3_CHEETAH_SETUP_TYPE = setuptools
-HOST_PYTHON3_CHEETAH_DL_SUBDIR = python-cheetah
-HOST_PYTHON3_CHEETAH_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 3/5] package/python3-cython: 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/libdnet/libdnet.mk                   |  2 +-
 package/python-cython/python-cython.mk       |  1 -
 package/python-fonttools/python-fonttools.mk |  2 +-
 package/python3-cython/python3-cython.hash   |  1 -
 package/python3-cython/python3-cython.mk     | 16 ----------------
 package/setools/setools.mk                   |  2 +-
 6 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 120000 package/python3-cython/python3-cython.hash
 delete mode 100644 package/python3-cython/python3-cython.mk

diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index e9a57d6ed2..4c58ea20a5 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -16,7 +16,7 @@ LIBDNET_CONF_OPTS = \
 LIBDNET_CONFIG_SCRIPTS = dnet-config
 
 ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y)
-LIBDNET_DEPENDENCIES += host-python3-cython python3
+LIBDNET_DEPENDENCIES += host-python-cython python3
 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin
 LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV)
 LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk
index 89708cb9a8..b9fbf7b11a 100644
--- a/package/python-cython/python-cython.mk
+++ b/package/python-cython/python-cython.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-cython/python3-cython.mk
 PYTHON_CYTHON_VERSION = 0.29.27
 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz
 PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5
diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk
index d5c4cdf8e5..c07011daa0 100644
--- a/package/python-fonttools/python-fonttools.mk
+++ b/package/python-fonttools/python-fonttools.mk
@@ -10,7 +10,7 @@ PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863
 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools
 PYTHON_FONTTOOLS_LICENSE = MIT
 PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE
-PYTHON_FONTTOOLS_DEPENDENCIES = host-python3-cython
+PYTHON_FONTTOOLS_DEPENDENCIES = host-python-cython
 PYTHON_FONTTOOLS_ENV = FONTTOOLS_WITH_CYTHON=1
 
 define PYTHON_FONTTOOLS_EXTRACT_CMDS
diff --git a/package/python3-cython/python3-cython.hash b/package/python3-cython/python3-cython.hash
deleted file mode 120000
index 70dde64105..0000000000
--- a/package/python3-cython/python3-cython.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-cython/python-cython.hash
\ No newline at end of file
diff --git a/package/python3-cython/python3-cython.mk b/package/python3-cython/python3-cython.mk
deleted file mode 100644
index 56d88b5bf7..0000000000
--- a/package/python3-cython/python3-cython.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# python3-cython
-#
-################################################################################
-
-# Please keep in sync with package/python-cython/python-cython.mk
-PYTHON3_CYTHON_VERSION = 0.29.27
-PYTHON3_CYTHON_SOURCE = Cython-$(PYTHON3_CYTHON_VERSION).tar.gz
-PYTHON3_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5
-PYTHON3_CYTHON_SETUP_TYPE = setuptools
-PYTHON3_CYTHON_LICENSE = Apache-2.0
-PYTHON3_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt
-HOST_PYTHON3_CYTHON_NEEDS_HOST_PYTHON = python3
-
-$(eval $(host-python-package))
diff --git a/package/setools/setools.mk b/package/setools/setools.mk
index 8e1c0d2cc6..5b4b4e30d8 100644
--- a/package/setools/setools.mk
+++ b/package/setools/setools.mk
@@ -12,7 +12,7 @@ SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+
 SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
 SETOOLS_CPE_ID_VENDOR = selinuxproject
 SETOOLS_SETUP_TYPE = setuptools
-HOST_SETOOLS_DEPENDENCIES = host-python3-cython host-libselinux host-libsepol host-python-networkx
+HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx
 HOST_SETOOLS_NEEDS_HOST_PYTHON = python3
 
 define SETOOLS_FIX_SETUP
-- 
2.20.1

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

[Buildroot] [PATCH 4/5] package/python3-ply: 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/libcamera/libcamera.mk       |  2 +-
 package/python-ply/python-ply.mk     |  1 -
 package/python3-ply/python3-ply.hash |  1 -
 package/python3-ply/python3-ply.mk   | 16 ----------------
 4 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 120000 package/python3-ply/python3-ply.hash
 delete mode 100644 package/python3-ply/python3-ply.mk

diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk
index 534d8d2637..7cd4bfa758 100644
--- a/package/libcamera/libcamera.mk
+++ b/package/libcamera/libcamera.mk
@@ -11,7 +11,7 @@ LIBCAMERA_DEPENDENCIES = \
 	host-openssl \
 	host-pkgconf \
 	host-python-jinja2 \
-	host-python3-ply \
+	host-python-ply \
 	host-python-pyyaml \
 	gnutls
 LIBCAMERA_CONF_OPTS = \
diff --git a/package/python-ply/python-ply.mk b/package/python-ply/python-ply.mk
index 50a3e32bc2..5dc7964d5f 100644
--- a/package/python-ply/python-ply.mk
+++ b/package/python-ply/python-ply.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-ply/python3-ply.mk
 PYTHON_PLY_VERSION = 3.11
 PYTHON_PLY_SOURCE = ply-$(PYTHON_PLY_VERSION).tar.gz
 PYTHON_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da
diff --git a/package/python3-ply/python3-ply.hash b/package/python3-ply/python3-ply.hash
deleted file mode 120000
index 5e07165c93..0000000000
--- a/package/python3-ply/python3-ply.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-ply/python-ply.hash
\ No newline at end of file
diff --git a/package/python3-ply/python3-ply.mk b/package/python3-ply/python3-ply.mk
deleted file mode 100644
index 15f66a49db..0000000000
--- a/package/python3-ply/python3-ply.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# python3-ply
-#
-################################################################################
-
-PYTHON3_PLY_VERSION = 3.11
-PYTHON3_PLY_SOURCE = ply-$(PYTHON3_PLY_VERSION).tar.gz
-PYTHON3_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da
-PYTHON3_PLY_SETUP_TYPE = setuptools
-PYTHON3_PLY_LICENSE = BSD-3-Clause
-PYTHON3_PLY_LICENSE_FILES = README.md
-
-HOST_PYTHON3_PLY_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 5/5] package/python3-psutil: 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/mongodb/mongodb.mk                 |  2 +-
 package/python-psutil/python-psutil.mk     |  1 -
 package/python3-psutil/python3-psutil.hash |  1 -
 package/python3-psutil/python3-psutil.mk   | 19 -------------------
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 120000 package/python3-psutil/python3-psutil.hash
 delete mode 100644 package/python3-psutil/python3-psutil.mk

diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk
index 2a5e00be79..e2a58a5f4e 100644
--- a/package/mongodb/mongodb.mk
+++ b/package/mongodb/mongodb.mk
@@ -17,7 +17,7 @@ MONGODB_SELINUX_MODULES = mongodb
 MONGODB_DEPENDENCIES = \
 	boost \
 	host-python-cheetah \
-	host-python3-psutil \
+	host-python-psutil \
 	host-python-pyyaml \
 	host-python3-regex \
 	host-python-requests \
diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk
index 3bba7ca343..413fc8a391 100644
--- a/package/python-psutil/python-psutil.mk
+++ b/package/python-psutil/python-psutil.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-psutil/python3-psutil.mk
 PYTHON_PSUTIL_VERSION = 5.8.0
 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
 PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7
diff --git a/package/python3-psutil/python3-psutil.hash b/package/python3-psutil/python3-psutil.hash
deleted file mode 120000
index ff688fab28..0000000000
--- a/package/python3-psutil/python3-psutil.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-psutil/python-psutil.hash
\ No newline at end of file
diff --git a/package/python3-psutil/python3-psutil.mk b/package/python3-psutil/python3-psutil.mk
deleted file mode 100644
index 1304124f57..0000000000
--- a/package/python3-psutil/python3-psutil.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-#
-# python3-psutil
-#
-################################################################################
-
-# Please keep in sync with package/python-psutil/python-psutil.mk
-PYTHON3_PSUTIL_VERSION = 5.8.0
-PYTHON3_PSUTIL_SOURCE = psutil-$(PYTHON3_PSUTIL_VERSION).tar.gz
-PYTHON3_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7
-PYTHON3_PSUTIL_SETUP_TYPE = setuptools
-PYTHON3_PSUTIL_LICENSE = BSD-3-Clause
-PYTHON3_PSUTIL_LICENSE_FILES = LICENSE
-PYTHON3_PSUTIL_CPE_ID_VENDOR = psutil_project
-PYTHON3_PSUTIL_CPE_ID_PRODUCT = psutil
-HOST_PYTHON3_PSUTIL_DL_SUBDIR = python-psutil
-HOST_PYTHON3_PSUTIL_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 1/5] package/python3-cffi: drop unused host package

[Peter Korsgaard]

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

 > Commit d9bf97cf16fa6945466a67 (package/python-cryptography: drop host
 > variant) dropped the dependency on host-python3-cffi, so it is now unused.
 > Drop it.

 > 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 2/5] package/python3-cheetah: 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 3/5] package/python3-cython: 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 5/5] package/python3-psutil: 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 4/5] package/python3-ply: 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