[oe] [meta-python2][PATCH] python-setuptools: copy patch from oe-core

Tim Orling ticotimo at gmail.com
Mon Jan 20 17:47:27 UTC 2020


The following patch is needed for python-setuptools-native:
0001-conditionally-do-not-fetch-code-by-easy_install.patch

While currently this is duplication of the same patch in oe-core,
there is no guarantee that the patch will continue to stay in sync
for py2, so copy the known working patch now.

Signed-off-by: Tim Orling <ticotimo at gmail.com>
---
 ...ly-do-not-fetch-code-by-easy_install.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 recipes-devtools/python/python-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch

diff --git a/recipes-devtools/python/python-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/recipes-devtools/python/python-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch
new file mode 100644
index 00000000..169d1b15
--- /dev/null
+++ b/recipes-devtools/python/python-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch
@@ -0,0 +1,32 @@
+From 5bba4f57f048016aa92ce5909e9e372db619554e Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia at windriver.com>
+Date: Tue, 17 Jul 2018 10:13:38 +0800
+Subject: [PATCH] conditionally do not fetch code by easy_install
+
+If var-NO_FETCH_BUILD is set, do not allow to fetch code from
+internet by easy_install.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
+
+---
+ setuptools/command/easy_install.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
+index 05508ce..945e118 100755
+--- a/setuptools/command/easy_install.py
++++ b/setuptools/command/easy_install.py
+@@ -640,6 +640,11 @@ class easy_install(Command):
+             os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
+ 
+     def easy_install(self, spec, deps=False):
++        if os.environ.get('NO_FETCH_BUILD', None):
++            log.error("ERROR: Do not try to fetch `%s' for building. "
++                      "Please add its native recipe to DEPENDS." % spec)
++            return None
++
+         if not self.editable:
+             self.install_site_py()
+ 
-- 
2.25.0



More information about the Openembedded-devel mailing list