package/python-pyasn-modules: remove duplicate package

This is a duplicate of python-pyasn1-modules.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index 95f17b1b31fb66a4243a8718f988b64ac851db0b..7058da5cb9d075f811c8896cac8ae8324853a3b0 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2020.05"
 
+config BR2_PACKAGE_PYTHON_PYASN_MODULES
+       bool "duplicate python-pyasn1-modules package removed"
+       select BR2_LEGACY
+       select BR2_PACKAGE_PYTHON_PYASN1_MODULES
+       help
+         This package was a duplicate of python-pyasn1-modules.
+
 config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174
        bool "duplicate QCA6174 firmware symbol removed"
        select BR2_LEGACY

diff --git a/DEVELOPERS b/DEVELOPERS
index 67456d0c4b71222a6b18718ae3531e7d2511f57b..a13a1694ea1d080091305150493869c9ec9f1dff 100644 (file)
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1763,7 +1763,6 @@ F:        package/python-crossbar/
 F:     package/python-lmdb/
 F:     package/python-mistune/
 F:     package/python-netaddr/
-F:     package/python-pyasn-modules/
 F:     package/python-pygments/
 F:     package/python-pynacl/
 F:     package/python-pytrie/

diff --git a/package/Config.in b/package/Config.in
index 7a0ff1716dcc0de25d8117d4264f23386fdfa5ad..55634e9479742fc45d7416154e43c8f24f08b363 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -1066,7 +1066,6 @@ menu "External python modules"
        source "package/python-py/Config.in"
        source "package/python-pyaes/Config.in"
        source "package/python-pyasn/Config.in"
-       source "package/python-pyasn-modules/Config.in"
        source "package/python-pyasn1/Config.in"
        source "package/python-pyasn1-modules/Config.in"
        source "package/python-pycairo/Config.in"

diff --git a/package/python-pyasn-modules/Config.in b/package/python-pyasn-modules/Config.in
deleted file mode 100644 (file)
index cedd68b..0000000
--- a/package/python-pyasn-modules/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_PYTHON_PYASN_MODULES
-       bool "python-pyasn-modules"
-       depends on BR2_INSTALL_LIBSTDCPP
-       select BR2_PACKAGE_PYTHON_PYASN # runtime
-       help
-         A collection of ASN.1-based protocols modules.
-
-         https://pypi.python.org/pypi/pyasn1-modules
-
-comment "python-pyasn-modules needs a toolchain w/ C++"
-       depends on !BR2_INSTALL_LIBSTDCPP

diff --git a/package/python-pyasn-modules/python-pyasn-modules.hash b/package/python-pyasn-modules/python-pyasn-modules.hash
deleted file mode 100644 (file)
index e5880d2..0000000
--- a/package/python-pyasn-modules/python-pyasn-modules.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=178129bc7fbf07215c25230c5f053f81
-md5    178129bc7fbf07215c25230c5f053f81  pyasn1-modules-0.0.8.tar.gz
-# Locally computed
-sha256 10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837  pyasn1-modules-0.0.8.tar.gz
-sha256  8bea85439e7446ecb270079cce926d605a7d10f51fe8789b1aeced557dcbe1b6  LICENSE.txt

diff --git a/package/python-pyasn-modules/python-pyasn-modules.mk b/package/python-pyasn-modules/python-pyasn-modules.mk
deleted file mode 100644 (file)
index b5e853a..0000000
--- a/package/python-pyasn-modules/python-pyasn-modules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-pyasn-modules
-#
-################################################################################
-
-PYTHON_PYASN_MODULES_VERSION = 0.0.8
-PYTHON_PYASN_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN_MODULES_VERSION).tar.gz
-PYTHON_PYASN_MODULES_SITE = https://pypi.python.org/packages/source/p/pyasn1-modules
-PYTHON_PYASN_MODULES_LICENSE = BSD-2-Clause
-PYTHON_PYASN_MODULES_LICENSE_FILES = LICENSE.txt
-PYTHON_PYASN_MODULES_SETUP_TYPE = setuptools
-
-$(eval $(python-package))