diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-02-28 15:32:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-01 09:28:52 +0000 |
commit | 2aa2b6b98756b1256451187faa4d6999367dda46 (patch) | |
tree | a722c984035003af4ebd70941c09ded0ca4c3879 | |
parent | df8f6f4978c16dc469894628bebd45c4479d5982 (diff) | |
download | poky-2aa2b6b98756b1256451187faa4d6999367dda46.tar.gz |
python3: upgrade 3.12.1 -> 3.12.2
0001-Avoid-shebang-overflow-on-python-config.py.patch
0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch
0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch
0001-gh-114492-Initialize-struct-termios-before-calling-t.patch
0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
0001-skip-no_stdout_fileno-test-due-to-load-variability.patch
0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch
0020-configure.ac-setup.py-do-not-add-a-c
refreshed for 3.12.2
Changelog:
https://docs.python.org/3.12/whatsnew/3.12.html
(From OE-Core rev: 288bdc342035f18451509b6c27e3b88b546dc984)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
10 files changed, 32 insertions, 57 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch index 03ecda98c2..0d807db39f 100644 --- a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch +++ b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 33bf96f31c4873032ace2cc9afacc3785997527a Mon Sep 17 00:00:00 2001 | 1 | From 365399f17d35719d828ddd49182dcb401fb7791c Mon Sep 17 00:00:00 2001 |
2 | From: Paulo Neves <ptsneves@gmail.com> | 2 | From: Paulo Neves <ptsneves@gmail.com> |
3 | Date: Tue, 7 Jun 2022 16:16:41 +0200 | 3 | Date: Tue, 7 Jun 2022 16:16:41 +0200 |
4 | Subject: [PATCH] Avoid shebang overflow on python-config.py | 4 | Subject: [PATCH] Avoid shebang overflow on python-config.py |
@@ -11,16 +11,15 @@ Denial reason: [1] | |||
11 | Upstream-Status: Denied [distribution] | 11 | Upstream-Status: Denied [distribution] |
12 | 12 | ||
13 | [1] https://github.com/python/cpython/pull/93760#pullrequestreview-1005365737 | 13 | [1] https://github.com/python/cpython/pull/93760#pullrequestreview-1005365737 |
14 | |||
15 | --- | 14 | --- |
16 | Makefile.pre.in | 2 ++ | 15 | Makefile.pre.in | 2 ++ |
17 | 1 file changed, 2 insertions(+) | 16 | 1 file changed, 2 insertions(+) |
18 | 17 | ||
19 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 18 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
20 | index fb0b525..75d2e73 100644 | 19 | index 77bf09a..6353c57 100644 |
21 | --- a/Makefile.pre.in | 20 | --- a/Makefile.pre.in |
22 | +++ b/Makefile.pre.in | 21 | +++ b/Makefile.pre.in |
23 | @@ -2335,6 +2335,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh | 22 | @@ -2339,6 +2339,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh |
24 | @ # Substitution happens here, as the completely-expanded BINDIR | 23 | @ # Substitution happens here, as the completely-expanded BINDIR |
25 | @ # is not available in configure | 24 | @ # is not available in configure |
26 | sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py | 25 | sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py |
diff --git a/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch b/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch index 158cbf8ee0..ee33128fa1 100644 --- a/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch +++ b/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch | |||
@@ -1,20 +1,19 @@ | |||
1 | From ea8e486a416b90c562f3b33faa91d9d1d030be0e Mon Sep 17 00:00:00 2001 | 1 | From 38278339832a57dbf5fa3ef21accaa03e2c814d7 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 30 Jan 2019 12:41:04 +0100 | 3 | Date: Wed, 30 Jan 2019 12:41:04 +0100 |
4 | Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data | 4 | Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | Makefile.pre.in | 3 +-- | 9 | Makefile.pre.in | 3 +-- |
11 | 1 file changed, 1 insertion(+), 2 deletions(-) | 10 | 1 file changed, 1 insertion(+), 2 deletions(-) |
12 | 11 | ||
13 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 12 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
14 | index 7af1845..fc7ab79 100644 | 13 | index dd5e69f..381feb0 100644 |
15 | --- a/Makefile.pre.in | 14 | --- a/Makefile.pre.in |
16 | +++ b/Makefile.pre.in | 15 | +++ b/Makefile.pre.in |
17 | @@ -656,8 +656,7 @@ profile-run-stamp: | 16 | @@ -658,8 +658,7 @@ profile-run-stamp: |
18 | # enabled. | 17 | # enabled. |
19 | $(MAKE) profile-gen-stamp | 18 | $(MAKE) profile-gen-stamp |
20 | # Next, run the profile task to generate the profile information. | 19 | # Next, run the profile task to generate the profile information. |
diff --git a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch index edb85395ff..197daa71a5 100644 --- a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch +++ b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bafdd769330c9d49a066fb1427f451b8d253262d Mon Sep 17 00:00:00 2001 | 1 | From 3471e3478e0760c42e04f8046cee2367ab5706d2 Mon Sep 17 00:00:00 2001 |
2 | From: Yi Fan Yu <yifan.yu@windriver.com> | 2 | From: Yi Fan Yu <yifan.yu@windriver.com> |
3 | Date: Thu, 1 Apr 2021 13:08:37 -0700 | 3 | Date: Thu, 1 Apr 2021 13:08:37 -0700 |
4 | Subject: [PATCH] Skip failing tests due to load variability on YP AB | 4 | Subject: [PATCH] Skip failing tests due to load variability on YP AB |
@@ -17,14 +17,13 @@ Skip two additional tests due to suspected load variability failures. | |||
17 | [YOCTO #15177] | 17 | [YOCTO #15177] |
18 | 18 | ||
19 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 19 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
20 | |||
21 | --- | 20 | --- |
22 | Lib/test/_test_multiprocessing.py | 3 +++ | 21 | Lib/test/_test_multiprocessing.py | 3 +++ |
23 | Lib/test/test_time.py | 2 ++ | 22 | Lib/test/test_time.py | 2 ++ |
24 | 2 files changed, 5 insertions(+) | 23 | 2 files changed, 5 insertions(+) |
25 | 24 | ||
26 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py | 25 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py |
27 | index d52b10c..5f0e4e3 100644 | 26 | index e42c7ab..dff5227 100644 |
28 | --- a/Lib/test/_test_multiprocessing.py | 27 | --- a/Lib/test/_test_multiprocessing.py |
29 | +++ b/Lib/test/_test_multiprocessing.py | 28 | +++ b/Lib/test/_test_multiprocessing.py |
30 | @@ -682,6 +682,7 @@ class _TestProcess(BaseTestCase): | 29 | @@ -682,6 +682,7 @@ class _TestProcess(BaseTestCase): |
@@ -43,7 +42,7 @@ index d52b10c..5f0e4e3 100644 | |||
43 | def test_timeout(self): | 42 | def test_timeout(self): |
44 | """ | 43 | """ |
45 | Test wait(timeout) | 44 | Test wait(timeout) |
46 | @@ -4992,6 +4994,7 @@ class TestWait(unittest.TestCase): | 45 | @@ -5024,6 +5026,7 @@ class TestWait(unittest.TestCase): |
47 | time.sleep(period) | 46 | time.sleep(period) |
48 | 47 | ||
49 | @support.requires_resource('walltime') | 48 | @support.requires_resource('walltime') |
diff --git a/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch b/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch index 141b708a67..8406ef30a2 100644 --- a/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch +++ b/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch | |||
@@ -1,8 +1,9 @@ | |||
1 | From bd0e1bf1504a5cba12133548bc49f1fcaf7b4da2 Mon Sep 17 00:00:00 2001 | 1 | From 439aa02f42d6e6715c172076261757fcb89a936a Mon Sep 17 00:00:00 2001 |
2 | From: "Miss Islington (bot)" | 2 | From: "Miss Islington (bot)" |
3 | <31488909+miss-islington@users.noreply.github.com> | 3 | <31488909+miss-islington@users.noreply.github.com> |
4 | Date: Tue, 23 Jan 2024 23:02:02 +0100 | 4 | Date: Tue, 23 Jan 2024 23:02:02 +0100 |
5 | Subject: [PATCH] gh-114492: Initialize struct termios before calling tcgetattr() (GH-114495) (GH-114502) | 5 | Subject: [PATCH] gh-114492: Initialize struct termios before calling |
6 | tcgetattr() (GH-114495) (GH-114502) | ||
6 | 7 | ||
7 | On Alpine Linux it could leave some field non-initialized. | 8 | On Alpine Linux it could leave some field non-initialized. |
8 | (cherry picked from commit d22c066b802592932f9eb18434782299e80ca42e) | 9 | (cherry picked from commit d22c066b802592932f9eb18434782299e80ca42e) |
@@ -12,8 +13,7 @@ Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | --- | 14 | --- |
14 | .../next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | 2 ++ | 15 | .../next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | 2 ++ |
15 | Modules/termios.c | 2 ++ | 16 | 1 file changed, 2 insertions(+) |
16 | 2 files changed, 4 insertions(+) | ||
17 | create mode 100644 Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | 17 | create mode 100644 Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst |
18 | 18 | ||
19 | diff --git a/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst b/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | 19 | diff --git a/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst b/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst |
@@ -24,19 +24,3 @@ index 0000000..8df8299 | |||
24 | @@ -0,0 +1,2 @@ | 24 | @@ -0,0 +1,2 @@ |
25 | +Make the result of :func:`termios.tcgetattr` reproducible on Alpine Linux. | 25 | +Make the result of :func:`termios.tcgetattr` reproducible on Alpine Linux. |
26 | +Previously it could leave a random garbage in some fields. | 26 | +Previously it could leave a random garbage in some fields. |
27 | diff --git a/Modules/termios.c b/Modules/termios.c | ||
28 | index c3d96cc..402e6ac 100644 | ||
29 | --- a/Modules/termios.c | ||
30 | +++ b/Modules/termios.c | ||
31 | @@ -84,6 +84,8 @@ termios_tcgetattr_impl(PyObject *module, int fd) | ||
32 | struct termios mode; | ||
33 | int r; | ||
34 | |||
35 | + /* Alpine Linux can leave some fields uninitialized. */ | ||
36 | + memset(&mode, 0, sizeof(mode)); | ||
37 | Py_BEGIN_ALLOW_THREADS | ||
38 | r = tcgetattr(fd, &mode); | ||
39 | Py_END_ALLOW_THREADS | ||
40 | -- | ||
41 | 2.43.0 | ||
42 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch index d668858066..bbeabe4389 100644 --- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +++ b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0558745601cc72c8d6d79cd691f4b82330b29d58 Mon Sep 17 00:00:00 2001 | 1 | From ababc7b1db8c406910766e11cdd04cbef7a706c9 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 | 3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 |
4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler | 4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler |
@@ -21,13 +21,12 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> | |||
21 | patch originally from Li Zhou, I just rework it to new version | 21 | patch originally from Li Zhou, I just rework it to new version |
22 | 22 | ||
23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
24 | |||
25 | --- | 24 | --- |
26 | configure.ac | 19 ++++++++++--------- | 25 | configure.ac | 19 ++++++++++--------- |
27 | 1 file changed, 10 insertions(+), 9 deletions(-) | 26 | 1 file changed, 10 insertions(+), 9 deletions(-) |
28 | 27 | ||
29 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
30 | index bd2be94..cb9e198 100644 | 29 | index 384718d..5a1d58b 100644 |
31 | --- a/configure.ac | 30 | --- a/configure.ac |
32 | +++ b/configure.ac | 31 | +++ b/configure.ac |
33 | @@ -137,6 +137,7 @@ AC_CONFIG_HEADERS([pyconfig.h]) | 32 | @@ -137,6 +137,7 @@ AC_CONFIG_HEADERS([pyconfig.h]) |
@@ -110,7 +109,7 @@ index bd2be94..cb9e198 100644 | |||
110 | *gcc*) | 109 | *gcc*) |
111 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null | 110 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
112 | then | 111 | then |
113 | @@ -6802,7 +6803,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then | 112 | @@ -6803,7 +6804,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then |
114 | # Some versions of gcc miscompile inline asm: | 113 | # Some versions of gcc miscompile inline asm: |
115 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 | 114 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 |
116 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html | 115 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html |
diff --git a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch index cd112c06a8..2d7bca6a77 100644 --- a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch +++ b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 23184742b009ef1a8b2c0c2d79515334d4450cb9 Mon Sep 17 00:00:00 2001 | 1 | From 217cea231462e7703e8c9ea39c0a6833f799a420 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Fri, 15 Sep 2023 08:48:33 -0400 | 3 | Date: Fri, 15 Sep 2023 08:48:33 -0400 |
4 | Subject: [PATCH] skip no_stdout_fileno test due to load variability | 4 | Subject: [PATCH] skip no_stdout_fileno test due to load variability |
@@ -11,16 +11,15 @@ Upstream-Status: Inappropriate [OE-Specific] | |||
11 | [YOCTO #15210] | 11 | [YOCTO #15210] |
12 | 12 | ||
13 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 13 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
14 | |||
15 | --- | 14 | --- |
16 | Lib/test/test_builtin.py | 1 + | 15 | Lib/test/test_builtin.py | 1 + |
17 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
18 | 17 | ||
19 | diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py | 18 | diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py |
20 | index de83b52..ba98fe8 100644 | 19 | index 4d03c46..b329b7a 100644 |
21 | --- a/Lib/test/test_builtin.py | 20 | --- a/Lib/test/test_builtin.py |
22 | +++ b/Lib/test/test_builtin.py | 21 | +++ b/Lib/test/test_builtin.py |
23 | @@ -2300,6 +2300,7 @@ class PtyTests(unittest.TestCase): | 22 | @@ -2326,6 +2326,7 @@ class PtyTests(unittest.TestCase): |
24 | # Check stdin/stdout error handler is used when invoking PyOS_Readline() | 23 | # Check stdin/stdout error handler is used when invoking PyOS_Readline() |
25 | self.check_input_tty("prompté", b"quux\xe9", "ascii") | 24 | self.check_input_tty("prompté", b"quux\xe9", "ascii") |
26 | 25 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch b/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch index 415db4bc5b..598ef08cc4 100644 --- a/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch +++ b/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 51a048251c552d9ead29a2a3e4884c138fcf9c1c Mon Sep 17 00:00:00 2001 | 1 | From d07ca7fbd874e230dec4d4c6d650a66ea2a9008e Mon Sep 17 00:00:00 2001 |
2 | From: Sebastian Pipping <sebastian@pipping.org> | 2 | From: Sebastian Pipping <sebastian@pipping.org> |
3 | Date: Wed, 7 Feb 2024 15:32:45 +0100 | 3 | Date: Wed, 7 Feb 2024 15:32:45 +0100 |
4 | Subject: [PATCH] test_xml_etree.py: Fix for Expat >=2.6.0 with reparse deferral | 4 | Subject: [PATCH] test_xml_etree.py: Fix for Expat >=2.6.0 with reparse |
5 | deferral | ||
5 | 6 | ||
6 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/115138] | 7 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/115138] |
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
@@ -12,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | create mode 100644 Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | 13 | create mode 100644 Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst |
13 | 14 | ||
14 | diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py | 15 | diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py |
15 | index 53a4e9f..9a0119c 100644 | 16 | index b50898f..4578367 100644 |
16 | --- a/Lib/test/test_xml_etree.py | 17 | --- a/Lib/test/test_xml_etree.py |
17 | +++ b/Lib/test/test_xml_etree.py | 18 | +++ b/Lib/test/test_xml_etree.py |
18 | @@ -1401,6 +1401,7 @@ class XMLPullParserTest(unittest.TestCase): | 19 | @@ -1403,6 +1403,7 @@ class XMLPullParserTest(unittest.TestCase): |
19 | def test_simple_xml(self): | 20 | def test_simple_xml(self): |
20 | for chunk_size in (None, 1, 5): | 21 | for chunk_size in (None, 1, 5): |
21 | with self.subTest(chunk_size=chunk_size): | 22 | with self.subTest(chunk_size=chunk_size): |
@@ -23,7 +24,7 @@ index 53a4e9f..9a0119c 100644 | |||
23 | parser = ET.XMLPullParser() | 24 | parser = ET.XMLPullParser() |
24 | self.assert_event_tags(parser, []) | 25 | self.assert_event_tags(parser, []) |
25 | self._feed(parser, "<!-- comment -->\n", chunk_size) | 26 | self._feed(parser, "<!-- comment -->\n", chunk_size) |
26 | @@ -1410,16 +1411,17 @@ class XMLPullParserTest(unittest.TestCase): | 27 | @@ -1412,16 +1413,17 @@ class XMLPullParserTest(unittest.TestCase): |
27 | chunk_size) | 28 | chunk_size) |
28 | self.assert_event_tags(parser, []) | 29 | self.assert_event_tags(parser, []) |
29 | self._feed(parser, ">\n", chunk_size) | 30 | self._feed(parser, ">\n", chunk_size) |
@@ -52,6 +53,3 @@ index 0000000..4dc9c13 | |||
52 | +++ b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | 53 | +++ b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst |
53 | @@ -0,0 +1 @@ | 54 | @@ -0,0 +1 @@ |
54 | +Fix etree XMLPullParser tests for Expat >=2.6.0 with reparse deferral | 55 | +Fix etree XMLPullParser tests for Expat >=2.6.0 with reparse deferral |
55 | -- | ||
56 | 2.43.0 | ||
57 | |||
diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch index ed1c1b9975..0661249bfd 100644 --- a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch +++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1438c3694665961aa9c478727846343ad31fa133 Mon Sep 17 00:00:00 2001 | 1 | From d0205c60d08f51d84bd8ddc07a57e8c71710fdad Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Fri, 17 Nov 2023 14:16:40 +0100 | 3 | Date: Fri, 17 Nov 2023 14:16:40 +0100 |
4 | Subject: [PATCH] configure.ac: do not add a curses include path from the host | 4 | Subject: [PATCH] configure.ac: do not add a curses include path from the host |
@@ -10,16 +10,15 @@ as dnf failures). | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [oe-core specific] | 11 | Upstream-Status: Inappropriate [oe-core specific] |
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
13 | |||
14 | --- | 13 | --- |
15 | configure.ac | 6 ------ | 14 | configure.ac | 6 ------ |
16 | 1 file changed, 6 deletions(-) | 15 | 1 file changed, 6 deletions(-) |
17 | 16 | ||
18 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
19 | index d81c19a..b15b765 100644 | 18 | index c49cd4f..affdedf 100644 |
20 | --- a/configure.ac | 19 | --- a/configure.ac |
21 | +++ b/configure.ac | 20 | +++ b/configure.ac |
22 | @@ -6507,12 +6507,6 @@ AS_VAR_IF([have_panel], [no], [ | 21 | @@ -6508,12 +6508,6 @@ AS_VAR_IF([have_panel], [no], [ |
23 | AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)]) | 22 | AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)]) |
24 | ]) | 23 | ]) |
25 | 24 | ||
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index c813b3975b..c1b20703e6 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c1badb04004c78f376f77f8c41718d51947bf873 Mon Sep 17 00:00:00 2001 | 1 | From 9f827c29adbe656af3c8fc963fdd8f47aec0c442 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 13 Jul 2021 23:19:29 +0100 | 3 | Date: Tue, 13 Jul 2021 23:19:29 +0100 |
4 | Subject: [PATCH] python3: Fix make race | 4 | Subject: [PATCH] python3: Fix make race |
@@ -12,16 +12,15 @@ Add a dependency to avoid the race. | |||
12 | 12 | ||
13 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
15 | |||
16 | --- | 15 | --- |
17 | Makefile.pre.in | 2 +- | 16 | Makefile.pre.in | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 18 | ||
20 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 19 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
21 | index fc7ab79..fb0b525 100644 | 20 | index 381feb0..77bf09a 100644 |
22 | --- a/Makefile.pre.in | 21 | --- a/Makefile.pre.in |
23 | +++ b/Makefile.pre.in | 22 | +++ b/Makefile.pre.in |
24 | @@ -2246,7 +2246,7 @@ COMPILEALL_OPTS=-j0 | 23 | @@ -2250,7 +2250,7 @@ COMPILEALL_OPTS=-j0 |
25 | TEST_MODULES=@TEST_MODULES@ | 24 | TEST_MODULES=@TEST_MODULES@ |
26 | 25 | ||
27 | .PHONY: libinstall | 26 | .PHONY: libinstall |
diff --git a/meta/recipes-devtools/python/python3_3.12.1.bb b/meta/recipes-devtools/python/python3_3.12.2.bb index b4916d8cef..61991cd8e9 100644 --- a/meta/recipes-devtools/python/python3_3.12.1.bb +++ b/meta/recipes-devtools/python/python3_3.12.2.bb | |||
@@ -37,7 +37,7 @@ SRC_URI:append:class-native = " \ | |||
37 | file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ | 37 | file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ |
38 | " | 38 | " |
39 | 39 | ||
40 | SRC_URI[sha256sum] = "8dfb8f426fcd226657f9e2bd5f1e96e53264965176fa17d32658e873591aeb21" | 40 | SRC_URI[sha256sum] = "be28112dac813d2053545c14bf13a16401a21877f1a69eb6ea5d84c4a0f3d870" |
41 | 41 | ||
42 | # exclude pre-releases for both python 2.x and 3.x | 42 | # exclude pre-releases for both python 2.x and 3.x |
43 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" | 43 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" |