summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch2
-rw-r--r--meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch2
-rw-r--r--meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch9
-rw-r--r--meta/recipes-devtools/python/python3/0001-bpo-46114-Fix-OpenSSL-version-check-for-3.0.1-GH-301.patch60
-rw-r--r--meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch2
-rw-r--r--meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch2
-rw-r--r--meta/recipes-devtools/python/python3_3.10.2.bb (renamed from meta/recipes-devtools/python/python3_3.10.1.bb)5
7 files changed, 10 insertions, 72 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
index 27a5992880..5485020eb4 100644
--- a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
+++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
@@ -1,4 +1,4 @@
1From df1a5e4bc6c8523eaa33daa2a90707fe6c6bddb6 Mon Sep 17 00:00:00 2001 1From b6ead2d17ceafed47e598b6f50f3ff669deec5ab Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com> 2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Wed, 4 Mar 2020 00:06:42 +0000 3Date: Wed, 4 Mar 2020 00:06:42 +0000
4Subject: [PATCH] Don't search system for headers/libraries 4Subject: [PATCH] Don't search system for headers/libraries
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
index ad384231a5..a9240b3c8a 100644
--- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
@@ -1,4 +1,4 @@
1From 2d4bde19e0df7244e1cd17c4f4a255d488cb3e56 Mon Sep 17 00:00:00 2001 1From 01d209277e145072e478d8b9acfea3638ee16cdc Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 10 Sep 2021 12:28:31 +0200 3Date: Fri, 10 Sep 2021 12:28:31 +0200
4Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration 4Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
diff --git a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
index fc2241b5b9..6ab335a405 100644
--- a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
+++ b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
@@ -1,4 +1,4 @@
1From 7cfa712eecf02edaefaf0e51f3c8a31933b88db1 Mon Sep 17 00:00:00 2001 1From bb409432f03dd8256865292e382ad16613737829 Mon Sep 17 00:00:00 2001
2From: Matthias Schoepfer <matthias.schoepfer@ithinx.io> 2From: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
3Date: Fri, 31 May 2019 15:34:34 +0200 3Date: Fri, 31 May 2019 15:34:34 +0200
4Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft 4Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
@@ -14,13 +14,12 @@ to do this in a more autoconf/autotools manner.
14Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] 14Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
15Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> 15Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
16 16
17
18--- 17---
19 configure.ac | 175 +++++++-------------------------------------------- 18 configure.ac | 175 +++++++--------------------------------------------
20 1 file changed, 21 insertions(+), 154 deletions(-) 19 1 file changed, 21 insertions(+), 154 deletions(-)
21 20
22diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
23index 299786b..d0db062 100644 22index 4230ef2..ee08b1b 100644
24--- a/configure.ac 23--- a/configure.ac
25+++ b/configure.ac 24+++ b/configure.ac
26@@ -718,160 +718,27 @@ then 25@@ -718,160 +718,27 @@ then
@@ -203,5 +202,5 @@ index 299786b..d0db062 100644
203+ ;; 202+ ;;
204+esac 203+esac
205 204
206 if test x$PLATFORM_TRIPLET != xdarwin; then 205 AC_MSG_CHECKING([for multiarch])
207 MULTIARCH=$($CC --print-multiarch 2>/dev/null) 206 AS_CASE([$ac_sys_system],
diff --git a/meta/recipes-devtools/python/python3/0001-bpo-46114-Fix-OpenSSL-version-check-for-3.0.1-GH-301.patch b/meta/recipes-devtools/python/python3/0001-bpo-46114-Fix-OpenSSL-version-check-for-3.0.1-GH-301.patch
deleted file mode 100644
index 6f4ceae188..0000000000
--- a/meta/recipes-devtools/python/python3/0001-bpo-46114-Fix-OpenSSL-version-check-for-3.0.1-GH-301.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@arm.com>
3
4From 251d2eadc7f5b4042245709f41c38169a284e146 Mon Sep 17 00:00:00 2001
5From: "Miss Islington (bot)"
6 <31488909+miss-islington@users.noreply.github.com>
7Date: Fri, 17 Dec 2021 07:38:11 -0800
8Subject: [PATCH] bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170)
9
10(cherry picked from commit 2985feac4e02d590bb78bcce9e30864be53280ac)
11
12Co-authored-by: Christian Heimes <christian@python.org>
13---
14 .github/workflows/build.yml | 2 +-
15 Lib/test/test_ssl.py | 6 +++++-
16 .../next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst | 1 +
17 Tools/ssl/multissltests.py | 2 +-
18 4 files changed, 8 insertions(+), 3 deletions(-)
19 create mode 100644 Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst
20
21diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
22index a485f7d4c3..873db6403d 100644
23--- a/Lib/test/test_ssl.py
24+++ b/Lib/test/test_ssl.py
25@@ -539,7 +539,11 @@ def test_openssl_version(self):
26 self.assertLessEqual(status, 15)
27
28 libressl_ver = f"LibreSSL {major:d}"
29- openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}"
30+ if major >= 3:
31+ # 3.x uses 0xMNN00PP0L
32+ openssl_ver = f"OpenSSL {major:d}.{minor:d}.{patch:d}"
33+ else:
34+ openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}"
35 self.assertTrue(
36 s.startswith((openssl_ver, libressl_ver)),
37 (s, t, hex(n))
38diff --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
39new file mode 100644
40index 0000000000..6878cea032
41--- /dev/null
42+++ b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst
43@@ -0,0 +1 @@
44+Fix test case for OpenSSL 3.0.1 version. OpenSSL 3.0 uses ``0xMNN00PP0L``.
45diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
46index ba2663e9a3..8fe5b5d0c2 100755
47--- a/Tools/ssl/multissltests.py
48+++ b/Tools/ssl/multissltests.py
49@@ -48,7 +48,7 @@
50
51 OPENSSL_RECENT_VERSIONS = [
52 "1.1.1l",
53- "3.0.0"
54+ "3.0.1"
55 ]
56
57 LIBRESSL_OLD_VERSIONS = [
58--
592.25.1
60
diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
index 1a1e3e960c..3c62c2acb8 100644
--- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
@@ -1,4 +1,4 @@
1From 8a91a3047222ac533c2ca00b6d27cf6f992e6b11 Mon Sep 17 00:00:00 2001 1From 78dd1def953e18e7cda0325bb26d27c051bb6890 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 31 Jan 2019 16:46:30 +0100 3Date: Thu, 31 Jan 2019 16:46:30 +0100
4Subject: [PATCH] distutils/sysconfig: append 4Subject: [PATCH] distutils/sysconfig: append
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index bb2984cc71..de4c6c4e19 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,4 +1,4 @@
1From 99cfdb5f3debd38f50b73a7713161f8b56ce842e Mon Sep 17 00:00:00 2001 1From 33b5a31df6050110f4481a24f5a0a0bf7fe80096 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 14 May 2013 15:00:26 -0700 3Date: Tue, 14 May 2013 15:00:26 -0700
4Subject: [PATCH] python3: Add target and native recipes 4Subject: [PATCH] python3: Add target and native recipes
diff --git a/meta/recipes-devtools/python/python3_3.10.1.bb b/meta/recipes-devtools/python/python3_3.10.2.bb
index d6ac431185..9c67461493 100644
--- a/meta/recipes-devtools/python/python3_3.10.1.bb
+++ b/meta/recipes-devtools/python/python3_3.10.2.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly
4LICENSE = "PSFv2" 4LICENSE = "PSFv2"
5SECTION = "devel/python" 5SECTION = "devel/python"
6 6
7LIC_FILES_CHKSUM = "file://LICENSE;md5=3dd7bed622743ef9b77169b3736f7990" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=4b8801e752a2c70ac41a5f9aa243f766"
8 8
9SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ 9SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
10 file://run-ptest \ 10 file://run-ptest \
@@ -32,7 +32,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
32 file://makerace.patch \ 32 file://makerace.patch \
33 file://0001-sysconfig.py-use-platlibdir-also-for-purelib.patch \ 33 file://0001-sysconfig.py-use-platlibdir-also-for-purelib.patch \
34 file://0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch \ 34 file://0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch \
35 file://0001-bpo-46114-Fix-OpenSSL-version-check-for-3.0.1-GH-301.patch \
36 " 35 "
37 36
38SRC_URI:append:class-native = " \ 37SRC_URI:append:class-native = " \
@@ -41,7 +40,7 @@ SRC_URI:append:class-native = " \
41 file://12-distutils-prefix-is-inside-staging-area.patch \ 40 file://12-distutils-prefix-is-inside-staging-area.patch \
42 file://0001-Don-t-search-system-for-headers-libraries.patch \ 41 file://0001-Don-t-search-system-for-headers-libraries.patch \
43 " 42 "
44SRC_URI[sha256sum] = "a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177" 43SRC_URI[sha256sum] = "17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7"
45 44
46# exclude pre-releases for both python 2.x and 3.x 45# exclude pre-releases for both python 2.x and 3.x
47UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" 46UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"