diff mbox series

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

Message ID 20220211081730.23068-3-peter@korsgaard.com
State Accepted
Headers show
Series [1/5] package/python3-pycryptodomex: drop host package | expand

Commit Message

Peter Korsgaard Feb. 11, 2022, 8:17 a.m. UTC 
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

Comments

Peter Korsgaard Feb. 11, 2022, 7:09 p.m. UTC | #1 
>>>>> "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.
diff mbox series

Patch

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))