diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-01-16 12:08:14 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-19 12:21:22 +0000 |
| commit | 78e30d940d1a931c65a14d864494d92f0889035e (patch) | |
| tree | 32e87ef22610ef937dd5e1b9a604d0deacf39107 /meta/recipes-devtools/python/python3/deterministic_imports.patch | |
| parent | 375ac472d848eb6bdd17656cfe005c905025ffab (diff) | |
| download | poky-78e30d940d1a931c65a14d864494d92f0889035e.tar.gz | |
python: update 3.11.5 -> 3.12.1
Drop distutils and smtpd modules from packaging, as both are gone in 3.12.
Rebase:
0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch
(drop setup.py chunk as the file is gone)
Drop patches:
0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch
(setup.py gone, lib/termcap not mentioned anywhere else)
0001-Don-t-search-system-for-headers-libraries.patch
(setup.py gone, usr/lib64 not mentioned anywhere else)
0001-Makefile-do-not-compile-.pyc-in-parallel.patch
(replaced with COMPILEALL_OPTS= in EXTRA_OEMAKE)
0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch
(setup.py gone, add_multiarch_paths not mentioned anywhere else)
0017-setup.py-do-not-report-missing-dependencies-for-disa.patch
(has been superseded by Setup.local tweak in do_configure:prepend)
12-distutils-prefix-is-inside-staging-area.patch
(distutils has been removed upstream, so this old, unplesant hack can be finally dropped)
avoid_warning_about_tkinter.patch
(setup.py gone, tkinter detection logic performed in configure.ac)
(From OE-Core rev: 716d82352545d3667a658b69d65d6127678dd150)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/deterministic_imports.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python3/deterministic_imports.patch | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/meta/recipes-devtools/python/python3/deterministic_imports.patch b/meta/recipes-devtools/python/python3/deterministic_imports.patch index 296b413cab..104df94964 100644 --- a/meta/recipes-devtools/python/python3/deterministic_imports.patch +++ b/meta/recipes-devtools/python/python3/deterministic_imports.patch | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | From 039d5e652796b55f1132afa568c7432b6ed89afd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 3 | Date: Fri, 27 May 2022 17:05:44 +0100 | ||
| 4 | Subject: [PATCH] python3: Ensure stale empty python module directories don't | ||
| 5 | |||
| 1 | There are two issues here. Firstly, the modules are accessed in on disk order. This | 6 | There are two issues here. Firstly, the modules are accessed in on disk order. This |
| 2 | means behaviour seen on one system might not reproduce on another and is a real headache. | 7 | means behaviour seen on one system might not reproduce on another and is a real headache. |
| 3 | 8 | ||
| @@ -9,12 +14,15 @@ As a result, patch this to a behaviour which works for us. | |||
| 9 | Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] | 14 | Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] |
| 10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 11 | 16 | ||
| 17 | --- | ||
| 18 | Lib/importlib/metadata/__init__.py | 9 ++++++++- | ||
| 19 | 1 file changed, 8 insertions(+), 1 deletion(-) | ||
| 12 | 20 | ||
| 13 | Index: Python-3.10.4/Lib/importlib/metadata/__init__.py | 21 | diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py |
| 14 | =================================================================== | 22 | index 82e0ce1..969cac4 100644 |
| 15 | --- Python-3.10.4.orig/Lib/importlib/metadata/__init__.py | 23 | --- a/Lib/importlib/metadata/__init__.py |
| 16 | +++ Python-3.10.4/Lib/importlib/metadata/__init__.py | 24 | +++ b/Lib/importlib/metadata/__init__.py |
| 17 | @@ -819,7 +819,14 @@ class Lookup: | 25 | @@ -710,7 +710,14 @@ class Lookup: |
| 18 | self.infos = FreezableDefaultDict(list) | 26 | self.infos = FreezableDefaultDict(list) |
| 19 | self.eggs = FreezableDefaultDict(list) | 27 | self.eggs = FreezableDefaultDict(list) |
| 20 | 28 | ||
