From 4cf90c157acb062118aad11ffe0f7754ee414da5 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 1 Aug 2017 13:48:25 +0300 Subject: [PATCH 1/2] python-pyasn1: bump to version 0.3.2 Signed-off-by: Alexandru Ardelean --- lang/python/python-pyasn1/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/python-pyasn1/Makefile b/lang/python/python-pyasn1/Makefile index 32dd8cf17..1e2705a41 100644 --- a/lang/python/python-pyasn1/Makefile +++ b/lang/python/python-pyasn1/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pyasn1 -PKG_VERSION:=0.2.3 +PKG_VERSION:=0.3.2 PKG_RELEASE:=1 PKG_SOURCE:=pyasn1-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://pypi.python.org/packages/69/17/eec927b7604d2663fef82204578a0056e11e0fc08d485fdb3b6199d9b590 -PKG_HASH:=738c4ebd88a718e700ee35c8d129acce2286542daa80a82823a7073644f706ad +PKG_SOURCE_URL:=https://pypi.python.org/packages/17/a2/266818077dbd002d53ebe5aaaa05a04786256cea8dba1899ac0b832ef028 +PKG_HASH:=90bd82e0db59d4319eaf01c2549b34c817d645275fce9ad41bac7429aa380690 PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=LICENSE.txt From 70381b8d67acb5593351ec7385b394d7f183489b Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 1 Aug 2017 14:24:15 +0300 Subject: [PATCH 2/2] pyasn1-modules: bump to version 0.0.11 ; add python3 variant ; add myself as maintainer Signed-off-by: Alexandru Ardelean --- lang/python/python-pyasn1-modules/Makefile | 57 +++++++++++++++------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/lang/python/python-pyasn1-modules/Makefile b/lang/python/python-pyasn1-modules/Makefile index bc4142b43..e51a7cfdb 100644 --- a/lang/python/python-pyasn1-modules/Makefile +++ b/lang/python/python-pyasn1-modules/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015-2017 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,30 +7,49 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=pyasn1-modules -PKG_VERSION:=0.0.8 +PKG_NAME:=python-pyasn1-modules +PKG_VERSION:=0.0.11 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://pypi.python.org/packages/source/p/pyasn1-modules -PKG_MD5SUM:=178129bc7fbf07215c25230c5f053f81 - -PKG_BUILD_DEPENDS:=python python-setuptools +PKG_SOURCE:=pyasn1-modules-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://pypi.python.org/packages/de/5f/0c6a1a096bfc2831ee8e2e951f79e6ec23c853c17ab5ba655322bfcde20a +PKG_HASH:=60d5c80bfee9b79b492d5d8a934b3ecfc523f2f83aaab4ffafa2bbb651d3c67a PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=LICENSE.txt -PKG_MAINTAINER:=Jeffery To +PKG_MAINTAINER:=Jeffery To , Alexandru Ardelean + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-pyasn1-modules-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk $(call include_mk, python-package.mk) +$(call include_mk, python3-package.mk) + +PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) + +define Package/python-pyasn1-modules/Default + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + URL:=http://sourceforge.net/projects/pyasn1/ +endef define Package/python-pyasn1-modules - SECTION:=lang - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=python-pyasn1-modules - URL:=http://sourceforge.net/projects/pyasn1/ - DEPENDS:=+python-light +python-pyasn1 +$(call Package/python-pyasn1-modules/Default) + TITLE:=python-pyasn1-modules + VARIANT:=python + DEPENDS:= \ + +PACKAGE_python-pyasn1-modules:python-light \ + +PACKAGE_python-pyasn1-modules:python-pyasn1 +endef + +define Package/python3-pyasn1-modules +$(call Package/python-pyasn1-modules/Default) + TITLE:=python3-pyasn1-modules + VARIANT:=python3 + DEPENDS:= \ + +PACKAGE_python3-pyasn1-modules:python3-light \ + +PACKAGE_python3-pyasn1-modules:python3-pyasn1 endef define Package/python-pyasn1-modules/description @@ -38,9 +57,13 @@ This is a small but growing collection of ASN.1 data structures expressed in Python terms using pyasn1 data model. endef -define Build/Compile - $(call Build/Compile/PyMod,,install --prefix="/usr" --root="$(PKG_INSTALL_DIR)") +define Package/python3-pyasn1-modules/description +$(call Package/python-pyasn1-modules/description) +. +(Variant for Python3). endef $(eval $(call PyPackage,python-pyasn1-modules)) $(eval $(call BuildPackage,python-pyasn1-modules)) +$(eval $(call Py3Package,python3-pyasn1-modules)) +$(eval $(call BuildPackage,python3-pyasn1-modules))