summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/files
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2020-07-25 11:54:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-27 10:37:57 +0100
commitc1a56579ff9c435a49114b15f54c2f481f7d928a (patch)
tree5951f0e002318752b41ac6ced45277ed85101a9c /meta/recipes-devtools/python/files
parent5008ee45e41ac99f7867e929124c77b539fe4fb9 (diff)
downloadpoky-c1a56579ff9c435a49114b15f54c2f481f7d928a.tar.gz
python3-setuptools: update to 49.2.0
Rebased patch and got rid of the .inc file as Python 2 is not supported anymore. (From OE-Core rev: ff3d9a2966e6593be9ac048d930fc841c24eae7d) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/files')
-rw-r--r--meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch16
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
index 201e3570d6..86c9363d65 100644
--- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
+++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
@@ -1,4 +1,4 @@
1From 234c3da52da09b28db5b2c4d33ebe9c800c461ac Mon Sep 17 00:00:00 2001 1From 768e1f2f14c9f1b3f9bd0e017c3f6183b45616e8 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 17 Jul 2018 10:13:38 +0800 3Date: Tue, 17 Jul 2018 10:13:38 +0800
4Subject: [PATCH] conditionally do not fetch code by easy_install 4Subject: [PATCH] conditionally do not fetch code by easy_install
@@ -9,16 +9,15 @@ internet by easy_install.
9Upstream-Status: Inappropriate [oe specific] 9Upstream-Status: Inappropriate [oe specific]
10 10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13--- 12---
14 setuptools/command/easy_install.py | 5 +++++ 13 setuptools/command/easy_install.py | 5 +++++
15 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
16 15
17diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py 16diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
18index 5a9576f..f5961cb 100644 17index bcbd4f58..6455afda 100644
19--- a/setuptools/command/easy_install.py 18--- a/setuptools/command/easy_install.py
20+++ b/setuptools/command/easy_install.py 19+++ b/setuptools/command/easy_install.py
21@@ -656,6 +656,11 @@ class easy_install(Command): 20@@ -653,6 +653,11 @@ class easy_install(Command):
22 os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) 21 os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
23 22
24 def easy_install(self, spec, deps=False): 23 def easy_install(self, spec, deps=False):
@@ -27,6 +26,9 @@ index 5a9576f..f5961cb 100644
27+ "Please add its native recipe to DEPENDS." % spec) 26+ "Please add its native recipe to DEPENDS." % spec)
28+ return None 27+ return None
29+ 28+
30 if not self.editable: 29 with self._tmpdir() as tmpdir:
31 self.install_site_py() 30 if not isinstance(spec, Requirement):
32 31 if URL_SCHEME(spec):
32--
332.25.1
34