Skip to contentSkip to conversation

package/python-pyasn: remove duplicate package

PATCH New James Hilliard 2 participants 2 messages Apr 19, 2020 – Apr 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/python-pyasn: remove duplicate package

This is a duplicate of python-pyasn1.

---
 Config.in.legacy                       |  7 +++++++
 DEVELOPERS                             |  1 -
 package/Config.in                      |  1 -
 package/python-pyasn/Config.in         | 14 --------------
 package/python-pyasn/python-pyasn.hash |  6 ------
 package/python-pyasn/python-pyasn.mk   | 14 --------------
 6 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 package/python-pyasn/Config.in
 delete mode 100644 package/python-pyasn/python-pyasn.hash
 delete mode 100644 package/python-pyasn/python-pyasn.mk
Config.in.legacy +7 -0
index 7058da5cb9..7f6f782e6d 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2020.05"
 
+config BR2_PACKAGE_PYTHON_PYASN
+	bool "duplicate python-pyasn1 package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_PYTHON_PYASN1
+	help
+	  This package was a duplicate of python-pyasn1.
+
 config BR2_PACKAGE_PYTHON_PYASN_MODULES
 	bool "duplicate python-pyasn1-modules package removed"
 	select BR2_LEGACY
DEVELOPERS +0 -1
index 0360dbc769..5f80af2a5f 100644
@@ -2253,7 +2253,6 @@ F:	package/davfs2/
 N:	Ryan Barnett <[email protected]>
 F:	package/atftp/
 F:	package/miraclecast/
-F:	package/python-pyasn/
 F:	package/python-pycrypto/
 F:	package/python-pysnmp/
 F:	package/python-pysnmp-mibs/
package/Config.in +0 -1
index 9ae9e0bb65..ef63daf97c 100644
@@ -1067,7 +1067,6 @@ menu "External python modules"
 	source "package/python-py/Config.in"
 	source "package/python-pyaes/Config.in"
 	source "package/python-pyalsa/Config.in"
-	source "package/python-pyasn/Config.in"
 	source "package/python-pyasn1/Config.in"
 	source "package/python-pyasn1-modules/Config.in"
 	source "package/python-pycairo/Config.in"
package/python-pyasn/Config.in deleted +0 -14
deleted file mode 100644
index 2396194df6..0000000000
@@ -1,14 +0,0 @@
-config BR2_PACKAGE_PYTHON_PYASN
-	bool "python-pyasn"
-	depends on BR2_INSTALL_LIBSTDCPP
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
-	help
-	  PyASN is a Python extension module that enables you to
-	  perform very fast IP address to Autonomous System Number
-	  lookups.
-
-	  https://github.com/hadiasghari/pyasn
-
-comment "python-pyasn needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
package/python-pyasn/python-pyasn.hash deleted +0 -6
deleted file mode 100644
index c08b64dd25..0000000000
@@ -1,6 +0,0 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f00a02a631d4016818659d1cc38d229a, sha256 locally computed
-md5     f00a02a631d4016818659d1cc38d229a  pyasn1-0.1.9.tar.gz
-sha256  853cacd96d1f701ddd67aa03ecc05f51890135b7262e922710112f12a2ed2a7f  pyasn1-0.1.9.tar.gz
-
-# Locally calculated
-sha256  8bea85439e7446ecb270079cce926d605a7d10f51fe8789b1aeced557dcbe1b6  LICENSE.txt
package/python-pyasn/python-pyasn.mk deleted +0 -14
deleted file mode 100644
index f34520f835..0000000000
@@ -1,14 +0,0 @@
-################################################################################
-#
-# python-pyasn
-#
-################################################################################
-
-PYTHON_PYASN_VERSION = 0.1.9
-PYTHON_PYASN_SOURCE = pyasn1-$(PYTHON_PYASN_VERSION).tar.gz
-PYTHON_PYASN_SITE = https://pypi.python.org/packages/source/p/pyasn1
-PYTHON_PYASN_LICENSE = BSD-2-Clause
-PYTHON_PYASN_LICENSE_FILES = LICENSE.txt
-PYTHON_PYASN_SETUP_TYPE = setuptools
-
-$(eval $(python-package))
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/python-pyasn: remove duplicate package

Quoted 14 lines · On Sun, 19 Apr 2020 16:47:19 -0600 James Hilliard <[email protected]>…

This is a duplicate of python-pyasn1.

---
 Config.in.legacy                       |  7 +++++++
 DEVELOPERS                             |  1 -
 package/Config.in                      |  1 -
 package/python-pyasn/Config.in         | 14 --------------
 package/python-pyasn/python-pyasn.hash |  6 ------
 package/python-pyasn/python-pyasn.mk   | 14 --------------
 6 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 package/python-pyasn/Config.in
 delete mode 100644 package/python-pyasn/python-pyasn.hash
 delete mode 100644 package/python-pyasn/python-pyasn.mk

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com