From 4be1abe228a75ec48445b08d53f4855d9c37aa50 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 9 Dec 2014 16:26:03 +0200 Subject: [PATCH 1/4] python-dns: fix python-mini dependency to python python-mini does not exist anymore For now we'll just fix the build, and we'll do a bit more smart packaging later. Signed-off-by: Alexandru Ardelean --- lang/python-dns/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python-dns/Makefile b/lang/python-dns/Makefile index cbb568001..8dcea1dfe 100644 --- a/lang/python-dns/Makefile +++ b/lang/python-dns/Makefile @@ -26,7 +26,7 @@ define Package/python-dns SUBMENU:=Python TITLE:=dnspython URL:=http://www.dnspython.org/ - DEPENDS:=+python-mini + DEPENDS:=+python endef define Package/python-dns/description From 50bbabec9f2574ced5fda8c2a3a4057690cd8b2c Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 10 Dec 2014 13:26:56 +0200 Subject: [PATCH 2/4] python-dns: add $(eval $(call PyPackage,python-dns)) Should be included by Python packages if they want to run Python-package-specific build rules. Signed-off-by: Alexandru Ardelean --- lang/python-dns/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/python-dns/Makefile b/lang/python-dns/Makefile index 8dcea1dfe..cc5901010 100644 --- a/lang/python-dns/Makefile +++ b/lang/python-dns/Makefile @@ -43,4 +43,5 @@ define Package/python-dns/install $(1)$(PYTHON_PKG_DIR) endef +$(eval $(call PyPackage,python-dns)) $(eval $(call BuildPackage,python-dns)) From 0bfec165fa043f7f1f055fb087b0dd11eee8534f Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 10 Dec 2014 13:11:17 +0200 Subject: [PATCH 3/4] python-dns: update compile rule and add PyPackage rules Signed-off-by: Alexandru Ardelean --- lang/python-dns/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/python-dns/Makefile b/lang/python-dns/Makefile index cc5901010..eca4df579 100644 --- a/lang/python-dns/Makefile +++ b/lang/python-dns/Makefile @@ -34,13 +34,13 @@ define Package/python-dns/description endef define Build/Compile - $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) + $(call Build/Compile/PyMod,,\ + install --prefix="$(PKG_INSTALL_DIR)/usr" \ + ) endef -define Package/python-dns/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/dns/* \ - $(1)$(PYTHON_PKG_DIR) +define PyPackage/python-dns/filespec ++|/usr/lib/python$(PYTHON_VERSION)/site-packages endef $(eval $(call PyPackage,python-dns)) From 1a108389e2061e4f46df50395adeaeb85549a20e Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 10 Dec 2014 13:19:44 +0200 Subject: [PATCH 4/4] python-dns: update PKG_NAME PKG_NAME should be the name of the actual OpenWRT package, and not the name of the original package name. Signed-off-by: Alexandru Ardelean --- lang/python-dns/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/python-dns/Makefile b/lang/python-dns/Makefile index eca4df579..aa5d2e2c8 100644 --- a/lang/python-dns/Makefile +++ b/lang/python-dns/Makefile @@ -7,15 +7,16 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=dnspython +PKG_NAME:=python-dns PKG_RELEASE:=1 PKG_VERSION:=1.12.0 PKG_SOURCE_URL:=http://www.dnspython.org/kits/$(PKG_VERSION) PKG_MD5SUM:=3f2601ef3c8b77fc6d21a9c77a81efeb -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=dnspython-$(PKG_VERSION).tar.gz PKG_MAINTAINER:=Denis Shulyaka PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DIR:=$(BUILD_DIR)/dnspython-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk $(call include_mk, python-package.mk)