diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-17 11:48:56 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-20 21:22:49 +0000 |
commit | 806de34fda21fb1ab38d6b00566eb3d538d574d0 (patch) | |
tree | e5c7f20b75cdf4d54e1bbcc1560ca504d34e3720 | |
parent | 4e0adf684005542430a230692583ed85e659ecd6 (diff) | |
download | poky-806de34fda21fb1ab38d6b00566eb3d538d574d0.tar.gz |
python3-setuptools: upgrade 40.0.0 -> 40.8.0
(From OE-Core rev: dceac54e05bb786e19de8db33982a8d54e41a915)
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.patch | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python-setuptools.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python-setuptools_40.8.0.bb (renamed from meta/recipes-devtools/python/python-setuptools_40.0.0.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_40.8.0.bb (renamed from meta/recipes-devtools/python/python3-setuptools_40.0.0.bb) | 0 |
4 files changed, 6 insertions, 8 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 4b17921880..169d1b155b 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 @@ | |||
1 | From 019422d19c6401fa8f45b1311ecd31bb087c809d Mon Sep 17 00:00:00 2001 | 1 | From 5bba4f57f048016aa92ce5909e9e372db619554e Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 | 3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 |
4 | Subject: [PATCH] conditionally do not fetch code by easy_install | 4 | Subject: [PATCH] conditionally do not fetch code by easy_install |
@@ -9,15 +9,16 @@ internet by easy_install. | |||
9 | Upstream-Status: Inappropriate [oe specific] | 9 | Upstream-Status: Inappropriate [oe specific] |
10 | 10 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | setuptools/command/easy_install.py | 5 +++++ | 14 | setuptools/command/easy_install.py | 5 +++++ |
14 | 1 file changed, 5 insertions(+) | 15 | 1 file changed, 5 insertions(+) |
15 | 16 | ||
16 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py | 17 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py |
17 | index 85ee40f..7eb9d2a 100755 | 18 | index 05508ce..945e118 100755 |
18 | --- a/setuptools/command/easy_install.py | 19 | --- a/setuptools/command/easy_install.py |
19 | +++ b/setuptools/command/easy_install.py | 20 | +++ b/setuptools/command/easy_install.py |
20 | @@ -637,6 +637,11 @@ class easy_install(Command): | 21 | @@ -640,6 +640,11 @@ class easy_install(Command): |
21 | os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) | 22 | os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) |
22 | 23 | ||
23 | def easy_install(self, spec, deps=False): | 24 | def easy_install(self, spec, deps=False): |
@@ -29,6 +30,3 @@ index 85ee40f..7eb9d2a 100755 | |||
29 | if not self.editable: | 30 | if not self.editable: |
30 | self.install_site_py() | 31 | self.install_site_py() |
31 | 32 | ||
32 | -- | ||
33 | 2.7.4 | ||
34 | |||
diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index 315ba31396..9092d7ad03 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc | |||
@@ -10,8 +10,8 @@ inherit pypi | |||
10 | 10 | ||
11 | SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" | 11 | SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" |
12 | 12 | ||
13 | SRC_URI[md5sum] = "260630ae1a64bafa39dcc53404d63829" | 13 | SRC_URI[md5sum] = "712697a5bc975cf479d487cd68206c20" |
14 | SRC_URI[sha256sum] = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f" | 14 | SRC_URI[sha256sum] = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d" |
15 | 15 | ||
16 | DEPENDS += "${PYTHON_PN}" | 16 | DEPENDS += "${PYTHON_PN}" |
17 | 17 | ||
diff --git a/meta/recipes-devtools/python/python-setuptools_40.0.0.bb b/meta/recipes-devtools/python/python-setuptools_40.8.0.bb index cf9440495b..cf9440495b 100644 --- a/meta/recipes-devtools/python/python-setuptools_40.0.0.bb +++ b/meta/recipes-devtools/python/python-setuptools_40.8.0.bb | |||
diff --git a/meta/recipes-devtools/python/python3-setuptools_40.0.0.bb b/meta/recipes-devtools/python/python3-setuptools_40.8.0.bb index 0dc1ed8622..0dc1ed8622 100644 --- a/meta/recipes-devtools/python/python3-setuptools_40.0.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_40.8.0.bb | |||