From 31d614f92cb2d34d657abdb9eb374e3e87dc4021 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 20 Jan 2017 18:11:18 +0200 Subject: [PATCH] python,python3: add python-pip-conf package to be used by both python-pip & python3-pip Signed-off-by: Alexandru Ardelean --- lang/python/Makefile | 17 +++++++++++++++++ lang/python/files/pip.conf | 3 +++ lang/python/files/python-package-pip.mk | 2 +- lang/python3/files/python3-package-pip.mk | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 lang/python/files/pip.conf diff --git a/lang/python/Makefile b/lang/python/Makefile index f12e0361b..42b10d55e 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -59,6 +59,16 @@ define Package/python/Default/description the development of higher quality, more maintainable code. endef +define Package/python-pip-conf +$(call Package/python/Default) + TITLE:=Configuration file for pip/pip3 + URL:=https://pip.pypa.io +endef + +define Package/python-pip-conf/description + Configuration file for pip/pip3 +endef + define Package/python-base $(call Package/python/Default) TITLE:=Python $(PYTHON_VERSION) interpreter @@ -257,6 +267,11 @@ define PyPackage/python/filespec -|$(PYTHON_PKG_DIR) endef +define Package/python-pip-conf/install + $(INSTALL_DIR) $(1)/etc + $(CP) ./files/pip.conf $(1)/etc +endef + HOST_LDFLAGS += \ $$$$(pkg-config --static --libs libcrypto libssl) @@ -288,6 +303,8 @@ $(eval $(call PyPackage,python-base)) $(eval $(call PyPackage,python-light)) $(eval $(call PyPackage,python)) +$(eval $(call BuildPackage,python-pip-conf)) + $(eval $(call BuildPackage,python-base)) $(eval $(call BuildPackage,python-light)) $(eval $(call BuildPackage,python)) diff --git a/lang/python/files/pip.conf b/lang/python/files/pip.conf new file mode 100644 index 000000000..89339e98a --- /dev/null +++ b/lang/python/files/pip.conf @@ -0,0 +1,3 @@ +[global] +cache-dir=/tmp/.cache +log-file=/tmp/pip-log.txt diff --git a/lang/python/files/python-package-pip.mk b/lang/python/files/python-package-pip.mk index 66bd6553f..dbbffbcc0 100644 --- a/lang/python/files/python-package-pip.mk +++ b/lang/python/files/python-package-pip.mk @@ -8,7 +8,7 @@ define Package/python-pip $(call Package/python/Default) TITLE:=Python $(PYTHON_VERSION) pip module - DEPENDS:=+python +python-setuptools + DEPENDS:=+python +python-setuptools +python-pip-conf endef define PyPackage/python-pip/install diff --git a/lang/python3/files/python3-package-pip.mk b/lang/python3/files/python3-package-pip.mk index e346e22c5..a42c27c9d 100644 --- a/lang/python3/files/python3-package-pip.mk +++ b/lang/python3/files/python3-package-pip.mk @@ -8,7 +8,7 @@ define Package/python3-pip $(call Package/python3/Default) TITLE:=Python $(PYTHON3_VERSION) pip module - DEPENDS:=+python3 +python3-setuptools + DEPENDS:=+python3 +python3-setuptools +python-pip-conf endef define Py3Package/python3-pip/install