diff options
| -rw-r--r-- | meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch | 47 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch | 8 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3_3.10.7.bb (renamed from meta/recipes-devtools/python/python3_3.10.6.bb) | 3 |
3 files changed, 6 insertions, 52 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch b/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch deleted file mode 100644 index e19df08f870..00000000000 --- a/meta/recipes-devtools/python/python3/0001-Mitigate-the-race-condition-in-testSockName.patch +++ /dev/null @@ -1,47 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 8103b90148e8768456c3ab707de105d63d9d5b20 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Fri, 17 Jun 2022 11:53:59 +0100 -Subject: [PATCH] Mitigate the race condition in testSockName - -find_unused_port() has an inherent race condition, but we can't use -bind_port() as that uses .getsockname() which this test is exercising. - -Try binding to unused ports a few times before failing. ---- - Lib/test/test_socket.py | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py -index c981903824..b1630d18b6 100644 ---- a/Lib/test/test_socket.py -+++ b/Lib/test/test_socket.py -@@ -1390,10 +1390,21 @@ def testStringToIPv6(self): - - def testSockName(self): - # Testing getsockname() -- port = socket_helper.find_unused_port() - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.addCleanup(sock.close) -- sock.bind(("0.0.0.0", port)) -+ -+ # Since find_unused_port() is inherently subject to race conditions, we -+ # call it a couple times if necessary. -+ for i in itertools.count(): -+ port = socket_helper.find_unused_port() -+ try: -+ sock.bind(("0.0.0.0", port)) -+ except OSError as e: -+ if e.errno != errno.EADDRINUSE or i == 5: -+ raise -+ else: -+ break -+ - name = sock.getsockname() - # XXX(nnorwitz): http://tinyurl.com/os5jz seems to indicate - # it reasonable to get the host's addr in addition to 0.0.0.0. --- -2.25.1 - diff --git a/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch b/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch index 041a03b0cdf..8c554feb4b6 100644 --- a/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch +++ b/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch @@ -1,4 +1,4 @@ -From 311cf9abc213fcd76795cc3a25814a15fb552065 Mon Sep 17 00:00:00 2001 +From 246c5ffe75a2d494e415d8a7522df9fe22056d41 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 7 Oct 2019 13:22:14 +0200 Subject: [PATCH] setup.py: do not report missing dependencies for disabled @@ -12,16 +12,18 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org> +Refresh for 3.10.7: +Signed-off-by: Tim Orling <tim.orling@konsulko.com> --- setup.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/setup.py b/setup.py -index 934cf2e..ccf83b4 100644 +index 85a2b26357..7605347bf5 100644 --- a/setup.py +++ b/setup.py -@@ -517,6 +517,14 @@ class PyBuildExt(build_ext): +@@ -517,6 +517,14 @@ def print_three_column(lst): print("%-*s %-*s %-*s" % (longest, e, longest, f, longest, g)) diff --git a/meta/recipes-devtools/python/python3_3.10.6.bb b/meta/recipes-devtools/python/python3_3.10.7.bb index 1f8b60a7a59..3f0f9c510ca 100644 --- a/meta/recipes-devtools/python/python3_3.10.6.bb +++ b/meta/recipes-devtools/python/python3_3.10.7.bb @@ -35,7 +35,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ file://deterministic_imports.patch \ file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ - file://0001-Mitigate-the-race-condition-in-testSockName.patch \ " SRC_URI:append:class-native = " \ @@ -44,7 +43,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] = "f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3" +SRC_URI[sha256sum] = "6eed8415b7516fb2f260906db5d48dd4c06acc0cb24a7d6cc15296a604dcdc48" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" |