summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch10
-rw-r--r--meta/recipes-devtools/python/python-setuptools.inc4
-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 @@
1From 019422d19c6401fa8f45b1311ecd31bb087c809d Mon Sep 17 00:00:00 2001 1From 5bba4f57f048016aa92ce5909e9e372db619554e 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,15 +9,16 @@ 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
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
16diff --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
17index 85ee40f..7eb9d2a 100755 18index 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--
332.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
11SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" 11SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch"
12 12
13SRC_URI[md5sum] = "260630ae1a64bafa39dcc53404d63829" 13SRC_URI[md5sum] = "712697a5bc975cf479d487cd68206c20"
14SRC_URI[sha256sum] = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f" 14SRC_URI[sha256sum] = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d"
15 15
16DEPENDS += "${PYTHON_PN}" 16DEPENDS += "${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