mirror of
https://git.yoctoproject.org/poky
synced 2026-02-12 11:43:04 +01:00
6343a41684
This was held by numpy rejecting setuptools >= 60.x, however it got a workaround in recent point releases and so the upgrade can proceed. Drop 0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch as changed code completely removed upstream. Replicate another distutils/sysconfig.py fix from python recipe via 0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch Add a tomli build dependency to python3-setuptools-scm as new setuptools exposes: | File "/srv/work/alex/poky/build-64-alt/tmp/work/x86_64-linux/python3-setuptools-scm-native/6.4.2-r0/setuptools_scm-6.4.2/src/setuptools_scm/config.py", line 59, in _lazy_tomli_load | from tomli import loads | ModuleNotFoundError: No module named 'tomli' (From OE-Core rev: 0907866325fbfb5774e1a3f0ba0cf110d9b9b663) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From d1b4fa4a99774878035a0f664ec0d9686e7f0c89 Mon Sep 17 00:00:00 2001
|
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
Date: Tue, 17 Jul 2018 10:13:38 +0800
|
|
Subject: [PATCH] conditionally do not fetch code by easy_install
|
|
|
|
If var-NO_FETCH_BUILD is set, do not allow to fetch code from
|
|
internet by easy_install.
|
|
|
|
Upstream-Status: Inappropriate [oe specific]
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
|
---
|
|
setuptools/command/easy_install.py | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
|
|
index 444d3b3..61e445a 100644
|
|
--- a/setuptools/command/easy_install.py
|
|
+++ b/setuptools/command/easy_install.py
|
|
@@ -648,6 +648,11 @@ class easy_install(Command):
|
|
os.path.exists(tmpdir) and rmtree(tmpdir)
|
|
|
|
def easy_install(self, spec, deps=False):
|
|
+ if os.environ.get('NO_FETCH_BUILD', None):
|
|
+ log.error("ERROR: Do not try to fetch `%s' for building. "
|
|
+ "Please add its native recipe to DEPENDS." % spec)
|
|
+ return None
|
|
+
|
|
with self._tmpdir() as tmpdir:
|
|
if not isinstance(spec, Requirement):
|
|
if URL_SCHEME(spec):
|