Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python/python3: fix .dist-info missing for setuptools and pip

Browse source 
Without .dist-info (similar to .egg-info), setuptools and pip are not
discoverable by pkg_resources.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To 2018-12-22 22:16:52 +08:00
parent cb6fc9d7a9
commit 2f55f2a7b5
6 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lang/python/python-version.mk
View file

@ -8,12 +8,8 @@
PYTHON_VERSION:=2.7 PYTHON_VERSION:=2.7
PYTHON_VERSION_MICRO:=15 PYTHON_VERSION_MICRO:=15
PYTHON_SETUPTOOLS_PKG_RELEASE:=1 PYTHON_SETUPTOOLS_PKG_RELEASE:=2
PYTHON_PIP_PKG_RELEASE:=1 PYTHON_PIP_PKG_RELEASE:=2
PYTHON_SETUPTOOLS_VERSION:=39.0.1 PYTHON_SETUPTOOLS_VERSION:=39.0.1
PYTHON_PIP_VERSION:=9.0.3 PYTHON_PIP_VERSION:=9.0.3
PYTHON_SETUPTOOLS_VERSION:=$(PYTHON_SETUPTOOLS_VERSION)-$(PYTHON_SETUPTOOLS_PKG_RELEASE)
PYTHON_PIP_VERSION:=$(PYTHON_PIP_VERSION)-$(PYTHON_PIP_PKG_RELEASE)

3
lang/python/python/files/python-package-pip.mk
View file

@ -8,7 +8,7 @@
define Package/python-pip define Package/python-pip
$(call Package/python/Default) $(call Package/python/Default)
TITLE:=Python $(PYTHON_VERSION) pip module TITLE:=Python $(PYTHON_VERSION) pip module
VERSION:=$(PYTHON_PIP_VERSION) VERSION:=$(PYTHON_PIP_VERSION)-$(PYTHON_PIP_PKG_RELEASE)
DEPENDS:=+python +python-setuptools +python-pip-conf DEPENDS:=+python +python-setuptools +python-pip-conf
endef endef
@ -19,6 +19,7 @@ define PyPackage/python-pip/install
$(CP) $(PKG_BUILD_DIR)/install-pip/bin/* $(1)/usr/bin $(CP) $(PKG_BUILD_DIR)/install-pip/bin/* $(1)/usr/bin
$(CP) \ $(CP) \
$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON_VERSION)/site-packages/pip \ $(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON_VERSION)/site-packages/pip \
$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON_VERSION)/site-packages/pip-$(PYTHON_PIP_VERSION).dist-info \
$(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/ $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/
endef endef

3
lang/python/python/files/python-package-setuptools.mk
View file

@ -8,7 +8,7 @@
define Package/python-setuptools define Package/python-setuptools
$(call Package/python/Default) $(call Package/python/Default)
TITLE:=Python $(PYTHON_VERSION) setuptools module TITLE:=Python $(PYTHON_VERSION) setuptools module
VERSION:=$(PYTHON_SETUPTOOLS_VERSION) VERSION:=$(PYTHON_SETUPTOOLS_VERSION)-$(PYTHON_SETUPTOOLS_PKG_RELEASE)
DEPENDS:=+python DEPENDS:=+python
endef endef
@ -20,6 +20,7 @@ define PyPackage/python-setuptools/install
$(CP) \ $(CP) \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/pkg_resources \ $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/pkg_resources \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/setuptools \ $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/setuptools \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/setuptools-$(PYTHON_SETUPTOOLS_VERSION).dist-info \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/easy_install.py \ $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/easy_install.py \
$(1)/usr/lib/python$(PYTHON_VERSION)/site-packages $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages
endef endef

8
lang/python/python3-version.mk
View file

@ -12,12 +12,8 @@ PYTHON3_VERSION_MICRO:=1
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
PYTHON3_SETUPTOOLS_PKG_RELEASE:=1 PYTHON3_SETUPTOOLS_PKG_RELEASE:=2
PYTHON3_PIP_PKG_RELEASE:=1 PYTHON3_PIP_PKG_RELEASE:=2
PYTHON3_SETUPTOOLS_VERSION:=39.0.1 PYTHON3_SETUPTOOLS_VERSION:=39.0.1
PYTHON3_PIP_VERSION:=10.0.1 PYTHON3_PIP_VERSION:=10.0.1
PYTHON3_SETUPTOOLS_VERSION:=$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE)
PYTHON3_PIP_VERSION:=$(PYTHON3_PIP_VERSION)-$(PYTHON3_PIP_PKG_RELEASE)

3
lang/python/python3/files/python3-package-pip.mk
View file

@ -8,7 +8,7 @@
define Package/python3-pip define Package/python3-pip
$(call Package/python3/Default) $(call Package/python3/Default)
TITLE:=Python $(PYTHON3_VERSION) pip module 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 DEPENDS:=+python3 +python3-setuptools +python-pip-conf
endef 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/bin/pip3* $(1)/usr/bin
$(CP) \ $(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 \
$(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/ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/
find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf
endef endef

3
lang/python/python3/files/python3-package-setuptools.mk
View file

@ -8,7 +8,7 @@
define Package/python3-setuptools define Package/python3-setuptools
$(call Package/python3/Default) $(call Package/python3/Default)
TITLE:=Python $(PYTHON3_VERSION) setuptools module TITLE:=Python $(PYTHON3_VERSION) setuptools module
VERSION:=$(PYTHON3_SETUPTOOLS_VERSION) VERSION:=$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE)
DEPENDS:=+python3 DEPENDS:=+python3
endef endef
@ -21,6 +21,7 @@ define Py3Package/python3-setuptools/install
$(CP) \ $(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/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 \
$(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 \ $(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/easy_install.py \
$(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages
find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf