summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch15
-rw-r--r--meta/recipes-devtools/python/python3-setuptools_75.6.0.bb (renamed from meta/recipes-devtools/python/python3-setuptools_72.1.0.bb)2
2 files changed, 12 insertions, 5 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 16b316e9cc..527160735f 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 @@
1From 80fe63816eb3bfd1f5b6d354e1f2442805cff4e0 Mon Sep 17 00:00:00 2001 1From 00611eb8151825632bc36c189109626d9223037f 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
@@ -11,18 +11,22 @@ when that ever gets removed this patch can also be deleted.
11 11
12Upstream-Status: Denied [https://github.com/pypa/setuptools/issues/4735] 12Upstream-Status: Denied [https://github.com/pypa/setuptools/issues/4735]
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14
15Update to apply against v75.6.0.
16
17Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
14--- 18---
15 setuptools/command/easy_install.py | 5 +++++ 19 setuptools/command/easy_install.py | 5 +++++
16 1 file changed, 5 insertions(+) 20 1 file changed, 5 insertions(+)
17 21
18diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py 22diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
19index 858fb20..62bd853 100644 23index 66fe68f7a..8647c2082 100644
20--- a/setuptools/command/easy_install.py 24--- a/setuptools/command/easy_install.py
21+++ b/setuptools/command/easy_install.py 25+++ b/setuptools/command/easy_install.py
22@@ -672,6 +672,11 @@ class easy_install(Command): 26@@ -673,6 +673,11 @@ class easy_install(Command):
23 os.path.exists(tmpdir) and _rmtree(tmpdir) 27 os.path.exists(tmpdir) and _rmtree(tmpdir)
24 28
25 def easy_install(self, spec, deps=False): 29 def easy_install(self, spec, deps: bool = False) -> Distribution | None:
26+ if os.environ.get('NO_FETCH_BUILD', None): 30+ if os.environ.get('NO_FETCH_BUILD', None):
27+ log.error("ERROR: Do not try to fetch `%s' for building. " 31+ log.error("ERROR: Do not try to fetch `%s' for building. "
28+ "Please add its native recipe to DEPENDS." % spec) 32+ "Please add its native recipe to DEPENDS." % spec)
@@ -31,3 +35,6 @@ index 858fb20..62bd853 100644
31 with self._tmpdir() as tmpdir: 35 with self._tmpdir() as tmpdir:
32 if not isinstance(spec, Requirement): 36 if not isinstance(spec, Requirement):
33 if URL_SCHEME(spec): 37 if URL_SCHEME(spec):
38--
392.39.5
40
diff --git a/meta/recipes-devtools/python/python3-setuptools_72.1.0.bb b/meta/recipes-devtools/python/python3-setuptools_75.6.0.bb
index 5a01111934..c0e4b7031d 100644
--- a/meta/recipes-devtools/python/python3-setuptools_72.1.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_75.6.0.bb
@@ -13,7 +13,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e
13SRC_URI += " \ 13SRC_URI += " \
14 file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" 14 file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch"
15 15
16SRC_URI[sha256sum] = "8d243eff56d095e5817f796ede6ae32941278f542e0f941867cc05ae52b162ec" 16SRC_URI[sha256sum] = "8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6"
17 17
18DEPENDS += "python3" 18DEPENDS += "python3"
19 19