diff options
| -rw-r--r-- | meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 10 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_68.1.2.bb (renamed from meta/recipes-devtools/python/python3-setuptools_68.1.0.bb) | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 1e5ab498a4..84a9492caf 100644 --- a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 5e603da9c01ccb828a03ea3e82d15599971f794f Mon Sep 17 00:00:00 2001 | 1 | From c90cc4a07ce6d2b7128e37d811d0c6bbc4b905a6 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 0b8d1159..93308060 100644 | 18 | index 8ba4f09..8ea40c5 100644 |
| 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 | @@ -644,6 +644,11 @@ class easy_install(Command): | 21 | @@ -676,6 +676,11 @@ class easy_install(Command): |
| 21 | os.path.exists(tmpdir) and _rmtree(tmpdir) | 22 | os.path.exists(tmpdir) and _rmtree(tmpdir) |
| 22 | 23 | ||
| 23 | def easy_install(self, spec, deps=False): | 24 | def easy_install(self, spec, deps=False): |
| @@ -29,6 +30,3 @@ index 0b8d1159..93308060 100644 | |||
| 29 | with self._tmpdir() as tmpdir: | 30 | with self._tmpdir() as tmpdir: |
| 30 | if not isinstance(spec, Requirement): | 31 | if not isinstance(spec, Requirement): |
| 31 | if URL_SCHEME(spec): | 32 | if URL_SCHEME(spec): |
| 32 | -- | ||
| 33 | 2.41.0 | ||
| 34 | |||
diff --git a/meta/recipes-devtools/python/python3-setuptools_68.1.0.bb b/meta/recipes-devtools/python/python3-setuptools_68.1.2.bb index e04cd1dcd0..a1e84b635c 100644 --- a/meta/recipes-devtools/python/python3-setuptools_68.1.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_68.1.2.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e | |||
| 11 | SRC_URI += " \ | 11 | SRC_URI += " \ |
| 12 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" | 12 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" |
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "d59c97e7b774979a5ccb96388efc9eb65518004537e85d52e81eaee89ab6dd91" | 14 | SRC_URI[sha256sum] = "3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d" |
| 15 | 15 | ||
| 16 | DEPENDS += "${PYTHON_PN}" | 16 | DEPENDS += "${PYTHON_PN}" |
| 17 | 17 | ||
