mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
python3: update 3.10.1 -> 3.10.2
License-Update: copyright years (From OE-Core rev: d6515a7f58d0405efea21e3be4158681ed9edbe6) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
e6d9cc20a2
commit
0b1dc4e3d4
@@ -1,4 +1,4 @@
|
||||
From df1a5e4bc6c8523eaa33daa2a90707fe6c6bddb6 Mon Sep 17 00:00:00 2001
|
||||
From b6ead2d17ceafed47e598b6f50f3ff669deec5ab Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Puhlman <jpuhlman@mvista.com>
|
||||
Date: Wed, 4 Mar 2020 00:06:42 +0000
|
||||
Subject: [PATCH] Don't search system for headers/libraries
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2d4bde19e0df7244e1cd17c4f4a255d488cb3e56 Mon Sep 17 00:00:00 2001
|
||||
From 01d209277e145072e478d8b9acfea3638ee16cdc Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 10 Sep 2021 12:28:31 +0200
|
||||
Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7cfa712eecf02edaefaf0e51f3c8a31933b88db1 Mon Sep 17 00:00:00 2001
|
||||
From bb409432f03dd8256865292e382ad16613737829 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
|
||||
Date: Fri, 31 May 2019 15:34:34 +0200
|
||||
Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
|
||||
@@ -14,13 +14,12 @@ to do this in a more autoconf/autotools manner.
|
||||
Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
|
||||
Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
|
||||
|
||||
|
||||
---
|
||||
configure.ac | 175 +++++++--------------------------------------------
|
||||
1 file changed, 21 insertions(+), 154 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 299786b..d0db062 100644
|
||||
index 4230ef2..ee08b1b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -718,160 +718,27 @@ then
|
||||
@@ -203,5 +202,5 @@ index 299786b..d0db062 100644
|
||||
+ ;;
|
||||
+esac
|
||||
|
||||
if test x$PLATFORM_TRIPLET != xdarwin; then
|
||||
MULTIARCH=$($CC --print-multiarch 2>/dev/null)
|
||||
AC_MSG_CHECKING([for multiarch])
|
||||
AS_CASE([$ac_sys_system],
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
From 251d2eadc7f5b4042245709f41c38169a284e146 Mon Sep 17 00:00:00 2001
|
||||
From: "Miss Islington (bot)"
|
||||
<31488909+miss-islington@users.noreply.github.com>
|
||||
Date: Fri, 17 Dec 2021 07:38:11 -0800
|
||||
Subject: [PATCH] bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170)
|
||||
|
||||
(cherry picked from commit 2985feac4e02d590bb78bcce9e30864be53280ac)
|
||||
|
||||
Co-authored-by: Christian Heimes <christian@python.org>
|
||||
---
|
||||
.github/workflows/build.yml | 2 +-
|
||||
Lib/test/test_ssl.py | 6 +++++-
|
||||
.../next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst | 1 +
|
||||
Tools/ssl/multissltests.py | 2 +-
|
||||
4 files changed, 8 insertions(+), 3 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst
|
||||
|
||||
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
||||
index a485f7d4c3..873db6403d 100644
|
||||
--- a/Lib/test/test_ssl.py
|
||||
+++ b/Lib/test/test_ssl.py
|
||||
@@ -539,7 +539,11 @@ def test_openssl_version(self):
|
||||
self.assertLessEqual(status, 15)
|
||||
|
||||
libressl_ver = f"LibreSSL {major:d}"
|
||||
- openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}"
|
||||
+ if major >= 3:
|
||||
+ # 3.x uses 0xMNN00PP0L
|
||||
+ openssl_ver = f"OpenSSL {major:d}.{minor:d}.{patch:d}"
|
||||
+ else:
|
||||
+ openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}"
|
||||
self.assertTrue(
|
||||
s.startswith((openssl_ver, libressl_ver)),
|
||||
(s, t, hex(n))
|
||||
diff --git a/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst
|
||||
new file mode 100644
|
||||
index 0000000000..6878cea032
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst
|
||||
@@ -0,0 +1 @@
|
||||
+Fix test case for OpenSSL 3.0.1 version. OpenSSL 3.0 uses ``0xMNN00PP0L``.
|
||||
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
|
||||
index ba2663e9a3..8fe5b5d0c2 100755
|
||||
--- a/Tools/ssl/multissltests.py
|
||||
+++ b/Tools/ssl/multissltests.py
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
OPENSSL_RECENT_VERSIONS = [
|
||||
"1.1.1l",
|
||||
- "3.0.0"
|
||||
+ "3.0.1"
|
||||
]
|
||||
|
||||
LIBRESSL_OLD_VERSIONS = [
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8a91a3047222ac533c2ca00b6d27cf6f992e6b11 Mon Sep 17 00:00:00 2001
|
||||
From 78dd1def953e18e7cda0325bb26d27c051bb6890 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 31 Jan 2019 16:46:30 +0100
|
||||
Subject: [PATCH] distutils/sysconfig: append
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 99cfdb5f3debd38f50b73a7713161f8b56ce842e Mon Sep 17 00:00:00 2001
|
||||
From 33b5a31df6050110f4481a24f5a0a0bf7fe80096 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 14 May 2013 15:00:26 -0700
|
||||
Subject: [PATCH] python3: Add target and native recipes
|
||||
|
||||
@@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly
|
||||
LICENSE = "PSFv2"
|
||||
SECTION = "devel/python"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=3dd7bed622743ef9b77169b3736f7990"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=4b8801e752a2c70ac41a5f9aa243f766"
|
||||
|
||||
SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
|
||||
file://run-ptest \
|
||||
@@ -32,7 +32,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
|
||||
file://makerace.patch \
|
||||
file://0001-sysconfig.py-use-platlibdir-also-for-purelib.patch \
|
||||
file://0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch \
|
||||
file://0001-bpo-46114-Fix-OpenSSL-version-check-for-3.0.1-GH-301.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = " \
|
||||
@@ -41,7 +40,7 @@ SRC_URI:append:class-native = " \
|
||||
file://12-distutils-prefix-is-inside-staging-area.patch \
|
||||
file://0001-Don-t-search-system-for-headers-libraries.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177"
|
||||
SRC_URI[sha256sum] = "17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7"
|
||||
|
||||
# exclude pre-releases for both python 2.x and 3.x
|
||||
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
|
||||
Reference in New Issue
Block a user