diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_75.8.0.bb (renamed from meta/recipes-devtools/python/python3-setuptools_75.6.0.bb) | 2 |
3 files changed, 8 insertions, 14 deletions
diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch index 68dca43e21..f5f110d691 100644 --- a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch +++ b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a9f3483b492317959a35886308c31c078e350a35 Mon Sep 17 00:00:00 2001 | 1 | From b84b849dc72d2523f18fdbbbd28a2cd975596d08 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Wed, 11 May 2022 21:41:14 +0200 | 3 | Date: Wed, 11 May 2022 21:41:14 +0200 |
4 | Subject: [PATCH] _distutils/sysconfig.py: make it possible to substite the | 4 | Subject: [PATCH] _distutils/sysconfig.py: make it possible to substite the |
@@ -20,10 +20,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
20 | 1 file changed, 10 insertions(+), 2 deletions(-) | 20 | 1 file changed, 10 insertions(+), 2 deletions(-) |
21 | 21 | ||
22 | diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py | 22 | diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py |
23 | index 7ebe67687..8039021a8 100644 | 23 | index da1eecb..bb02a09 100644 |
24 | --- a/setuptools/_distutils/sysconfig.py | 24 | --- a/setuptools/_distutils/sysconfig.py |
25 | +++ b/setuptools/_distutils/sysconfig.py | 25 | +++ b/setuptools/_distutils/sysconfig.py |
26 | @@ -121,6 +121,8 @@ def get_python_inc(plat_specific=False, prefix=None): | 26 | @@ -122,6 +122,8 @@ def get_python_inc(plat_specific=False, prefix=None): |
27 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. | 27 | sys.base_exec_prefix -- i.e., ignore 'plat_specific'. |
28 | """ | 28 | """ |
29 | default_prefix = BASE_EXEC_PREFIX if plat_specific else BASE_PREFIX | 29 | default_prefix = BASE_EXEC_PREFIX if plat_specific else BASE_PREFIX |
@@ -32,7 +32,7 @@ index 7ebe67687..8039021a8 100644 | |||
32 | resolved_prefix = prefix if prefix is not None else default_prefix | 32 | resolved_prefix = prefix if prefix is not None else default_prefix |
33 | # MinGW imitates posix like layout, but os.name != posix | 33 | # MinGW imitates posix like layout, but os.name != posix |
34 | os_name = "posix" if is_mingw() else os.name | 34 | os_name = "posix" if is_mingw() else os.name |
35 | @@ -241,7 +243,13 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None): | 35 | @@ -242,7 +244,13 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None): |
36 | 36 | ||
37 | early_prefix = prefix | 37 | early_prefix = prefix |
38 | 38 | ||
@@ -47,7 +47,7 @@ index 7ebe67687..8039021a8 100644 | |||
47 | if standard_lib: | 47 | if standard_lib: |
48 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX | 48 | prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX |
49 | else: | 49 | else: |
50 | @@ -256,7 +264,7 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None): | 50 | @@ -257,7 +265,7 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None): |
51 | # Pure Python | 51 | # Pure Python |
52 | libdir = "lib" | 52 | libdir = "lib" |
53 | implementation = 'pypy' if IS_PYPY else 'python' | 53 | implementation = 'pypy' if IS_PYPY else 'python' |
@@ -56,6 +56,3 @@ index 7ebe67687..8039021a8 100644 | |||
56 | return _posix_lib(standard_lib, libpython, early_prefix, prefix) | 56 | return _posix_lib(standard_lib, libpython, early_prefix, prefix) |
57 | elif os.name == "nt": | 57 | elif os.name == "nt": |
58 | if standard_lib: | 58 | if standard_lib: |
59 | -- | ||
60 | 2.39.2 | ||
61 | |||
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 527160735f..f320bf4e6f 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 00611eb8151825632bc36c189109626d9223037f Mon Sep 17 00:00:00 2001 | 1 | From 9441848a121912b6627c7188ab95595684c8306b 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 |
@@ -20,7 +20,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
20 | 1 file changed, 5 insertions(+) | 20 | 1 file changed, 5 insertions(+) |
21 | 21 | ||
22 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py | 22 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py |
23 | index 66fe68f7a..8647c2082 100644 | 23 | index 66fe68f..8647c20 100644 |
24 | --- a/setuptools/command/easy_install.py | 24 | --- a/setuptools/command/easy_install.py |
25 | +++ b/setuptools/command/easy_install.py | 25 | +++ b/setuptools/command/easy_install.py |
26 | @@ -673,6 +673,11 @@ class easy_install(Command): | 26 | @@ -673,6 +673,11 @@ class easy_install(Command): |
@@ -35,6 +35,3 @@ index 66fe68f7a..8647c2082 100644 | |||
35 | with self._tmpdir() as tmpdir: | 35 | with self._tmpdir() as tmpdir: |
36 | if not isinstance(spec, Requirement): | 36 | if not isinstance(spec, Requirement): |
37 | if URL_SCHEME(spec): | 37 | if URL_SCHEME(spec): |
38 | -- | ||
39 | 2.39.5 | ||
40 | |||
diff --git a/meta/recipes-devtools/python/python3-setuptools_75.6.0.bb b/meta/recipes-devtools/python/python3-setuptools_75.8.0.bb index c0e4b7031d..02e299d0be 100644 --- a/meta/recipes-devtools/python/python3-setuptools_75.6.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_75.8.0.bb | |||
@@ -13,7 +13,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e | |||
13 | SRC_URI += " \ | 13 | SRC_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 | ||
16 | SRC_URI[sha256sum] = "8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6" | 16 | SRC_URI[sha256sum] = "c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6" |
17 | 17 | ||
18 | DEPENDS += "python3" | 18 | DEPENDS += "python3" |
19 | 19 | ||