summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-06-26 09:18:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-30 23:03:02 +0100
commit259d2e35e7ba3cbd496d6383e58cfdc22b267f0e (patch)
tree46dddfe2c5e84329dcc894c46e8ca03f61ecd18c
parent407b8e2344dc036350959c5e7d27c121dbaa797e (diff)
downloadpoky-259d2e35e7ba3cbd496d6383e58cfdc22b267f0e.tar.gz
python3-setuptools: upgrade 47.1.1 -> 47.3.1
(From OE-Core rev: 8f23d7683e0be7fb77e2ca5a3a8b55fbc51117e7) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch6
-rw-r--r--meta/recipes-devtools/python/python-setuptools.inc3
-rw-r--r--meta/recipes-devtools/python/python3-setuptools_47.3.1.bb (renamed from meta/recipes-devtools/python/python3-setuptools_47.1.1.bb)0
3 files changed, 4 insertions, 5 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 5f99cd2512..201e3570d6 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 a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001 1From 234c3da52da09b28db5b2c4d33ebe9c800c461ac 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
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15 1 file changed, 5 insertions(+) 15 1 file changed, 5 insertions(+)
16 16
17diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py 17diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
18index 426301d..55c8062 100644 18index 5a9576f..f5961cb 100644
19--- a/setuptools/command/easy_install.py 19--- a/setuptools/command/easy_install.py
20+++ b/setuptools/command/easy_install.py 20+++ b/setuptools/command/easy_install.py
21@@ -649,6 +649,11 @@ class easy_install(Command): 21@@ -656,6 +656,11 @@ class easy_install(Command):
22 os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) 22 os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
23 23
24 def easy_install(self, spec, deps=False): 24 def easy_install(self, spec, deps=False):
diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc
index 9322ca9a05..ecf1205752 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -12,8 +12,7 @@ SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-e
12 12
13SRC_URI += "file://0001-change-shebang-to-python3.patch" 13SRC_URI += "file://0001-change-shebang-to-python3.patch"
14 14
15SRC_URI[md5sum] = "6e9de90b242fdd60ef59f497424ce13a" 15SRC_URI[sha256sum] = "843037738d1e34e8b326b5e061f474aca6ef9d7ece41329afbc8aac6195a3920"
16SRC_URI[sha256sum] = "145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74"
17 16
18DEPENDS += "${PYTHON_PN}" 17DEPENDS += "${PYTHON_PN}"
19 18
diff --git a/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb b/meta/recipes-devtools/python/python3-setuptools_47.3.1.bb
index 0dc1ed8622..0dc1ed8622 100644
--- a/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_47.3.1.bb