summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-11-24 09:08:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-25 21:55:10 +0000
commitcd91af372f85ff293ee1498f9fee40cb17fbcb4b (patch)
tree6a995601851cc0f3a21ba96be76699eb84ce830a /meta/recipes-devtools
parent98b85e193e37f6d9a74b472224949a74901a41a1 (diff)
downloadpoky-cd91af372f85ff293ee1498f9fee40cb17fbcb4b.tar.gz
python3-setuptools: update 58.5.3 -> 59.2.0
(From OE-Core rev: 717e538e70f78d79ba7cec2797024af0dc91aeb0) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch4
-rw-r--r--meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch13
-rw-r--r--meta/recipes-devtools/python/python3-setuptools_59.2.0.bb (renamed from meta/recipes-devtools/python/python3-setuptools_58.5.3.bb)2
3 files changed, 10 insertions, 9 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 c5d6c64eda..4958e8e63d 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 dd77d2f4486079380235ed0466d2eab110f7bdc5 Mon Sep 17 00:00:00 2001 1From 1f578f993aae157f42923624042fafe4b01add10 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
@@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15 1 file changed, 5 insertions(+) 15 1 file changed, 5 insertions(+)
16 16
17diff --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
18index 1aed0e8..f491c0a 100644 18index fc848d0..c04a5de 100644
19--- a/setuptools/command/easy_install.py 19--- a/setuptools/command/easy_install.py
20+++ b/setuptools/command/easy_install.py 20+++ b/setuptools/command/easy_install.py
21@@ -642,6 +642,11 @@ class easy_install(Command): 21@@ -642,6 +642,11 @@ class easy_install(Command):
diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch
index 565cf8ae8d..3150187951 100644
--- a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch
+++ b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch
@@ -1,4 +1,4 @@
1From 44349672cbff8945693c8d2821c82e9f04bfc8b5 Mon Sep 17 00:00:00 2001 1From 1ff575308248b183639c8cb14afee7c8572bd2b8 Mon Sep 17 00:00:00 2001
2From: Tim Orling <timothy.t.orling@intel.com> 2From: Tim Orling <timothy.t.orling@intel.com>
3Date: Wed, 20 Oct 2021 17:38:10 +0000 3Date: Wed, 20 Oct 2021 17:38:10 +0000
4Subject: [PATCH] _distutils/sysconfig: append 4Subject: [PATCH] _distutils/sysconfig: append
@@ -15,18 +15,19 @@ from Alex Kanavin <alex.kanavin@gmail.com>
15Upstream-Status: Inappropriate [oe-specific] 15Upstream-Status: Inappropriate [oe-specific]
16 16
17Signed-off-by: Tim Orling <timothy.t.orling@intel.com> 17Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
18
18--- 19---
19 setuptools/_distutils/sysconfig.py | 2 ++ 20 setuptools/_distutils/sysconfig.py | 2 ++
20 1 file changed, 2 insertions(+) 21 1 file changed, 2 insertions(+)
21 22
22diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py 23diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
23index 8832b3e..bbc7c08 100644 24index d36d94f..616eb91 100644
24--- a/setuptools/_distutils/sysconfig.py 25--- a/setuptools/_distutils/sysconfig.py
25+++ b/setuptools/_distutils/sysconfig.py 26+++ b/setuptools/_distutils/sysconfig.py
26@@ -461,6 +461,8 @@ def _init_posix(): 27@@ -484,6 +484,8 @@ def _init_posix():
27 platform=sys.platform, 28 multiarch=getattr(sys.implementation, '_multiarch', ''),
28 multiarch=getattr(sys.implementation, '_multiarch', ''), 29 ),
29 )) 30 )
30+ if 'STAGING_LIBDIR' in os.environ: 31+ if 'STAGING_LIBDIR' in os.environ:
31+ sys.path.append(os.environ['STAGING_LIBDIR']+'/python-sysconfigdata') 32+ sys.path.append(os.environ['STAGING_LIBDIR']+'/python-sysconfigdata')
32 try: 33 try:
diff --git a/meta/recipes-devtools/python/python3-setuptools_58.5.3.bb b/meta/recipes-devtools/python/python3-setuptools_59.2.0.bb
index ddc3fca354..704f58abd3 100644
--- a/meta/recipes-devtools/python/python3-setuptools_58.5.3.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_59.2.0.bb
@@ -13,7 +13,7 @@ SRC_URI += "\
13 file://0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch \ 13 file://0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch \
14" 14"
15 15
16SRC_URI[sha256sum] = "dae6b934a965c8a59d6d230d3867ec408bb95e73bd538ff77e71fedf1eaca729" 16SRC_URI[sha256sum] = "157d21de9d055ab9e8ea3186d91e7f4f865e11f42deafa952d90842671fc2576"
17 17
18DEPENDS += "${PYTHON_PN}" 18DEPENDS += "${PYTHON_PN}"
19 19