diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-12-30 20:16:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-30 20:16:38 +0200 |
| commit | 0e9715553c0c66db936f9ea570ba925210608973 (patch) | |
| tree | 3eb422126291c25b442c293582510c3e3d9e68a0 /lang/python/python3/files | |
| parent | 0dae73880b920a2ee0ca0a7c19b29fc1f733c541 (diff) | |
| parent | 2f55f2a7b559b98bd2bb804ab7b8a2445ad05ab5 (diff) | |
Merge pull request #7755 from jefferyto/python-dist-info
python/python3: fix .dist-info missing for setuptools and pip
Diffstat (limited to 'lang/python/python3/files')
| -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 |