diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2019-01-01 21:55:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-01 21:55:43 +0200 |
| commit | 85bfefb5614c46b7b094fa545e1c4dcf94556fb3 (patch) | |
| tree | c1756ec90652a95515ef36a6fc4dc3f276f914ea /lang/python/python3 | |
| parent | 94b3e50e0447f727317954ddfbe6d1448af46b2a (diff) | |
| parent | e3f32b75b32dbe11958017ad77cf0b39e821728f (diff) | |
Merge pull request #7757 from jefferyto/openwrt-18.06-python-dist-info
[openwrt-18.06] python/python3: fix .dist-info missing for setuptools and pip
Diffstat (limited to 'lang/python/python3')
| -rw-r--r-- | lang/python/python3/files/python3-package-pip.mk | 3 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-setuptools.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lang/python/python3/files/python3-package-pip.mk b/lang/python/python3/files/python3-package-pip.mk index ff9b5ac74..1aaeaf2ee 100644 --- a/lang/python/python3/files/python3-package-pip.mk +++ b/lang/python/python3/files/python3-package-pip.mk @@ -8,7 +8,7 @@ define Package/python3-pip $(call Package/python3/Default) TITLE:=Python $(PYTHON3_VERSION) pip module - VERSION:=$(PYTHON3_PIP_VERSION) + VERSION:=$(PYTHON3_PIP_VERSION)-$(PYTHON3_PIP_PKG_RELEASE) DEPENDS:=+python3 +python3-setuptools +python-pip-conf endef @@ -19,6 +19,7 @@ define Package/python3-pip/install $(CP) $(PKG_BUILD_DIR)/install-pip/bin/pip3* $(1)/usr/bin $(CP) \ $(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages/pip \ + $(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages/pip-$(PYTHON3_PIP_VERSION).dist-info \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf endef diff --git a/lang/python/python3/files/python3-package-setuptools.mk b/lang/python/python3/files/python3-package-setuptools.mk index 684d3e64e..c8415cbd9 100644 --- a/lang/python/python3/files/python3-package-setuptools.mk +++ b/lang/python/python3/files/python3-package-setuptools.mk @@ -8,7 +8,7 @@ define Package/python3-setuptools $(call Package/python3/Default) TITLE:=Python $(PYTHON3_VERSION) setuptools module - VERSION:=$(PYTHON3_SETUPTOOLS_VERSION) + VERSION:=$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE) DEPENDS:=+python3 endef @@ -21,6 +21,7 @@ define Py3Package/python3-setuptools/install $(CP) \ $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/pkg_resources \ $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/setuptools \ + $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/setuptools-$(PYTHON3_SETUPTOOLS_VERSION).dist-info \ $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/easy_install.py \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf |