From patchwork Wed Oct 16 19:36:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 50791 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70F51D2A54D for ; Wed, 16 Oct 2024 19:36:19 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web11.32599.1729107372404325223 for ; Wed, 16 Oct 2024 12:36:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=P2jiWn5Z; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4314f38d274so2561845e9.1 for ; Wed, 16 Oct 2024 12:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729107371; x=1729712171; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WBs3sIjuOq1Hz73N2mtXShFzbqAoODZKD1Xn+1XWtGU=; b=P2jiWn5ZPYz0HXVOPwGC8RhaOXqpovF8QNn9i9482WbgMweBUcpIVix9r7a9DRtLdv KswoODHJ4toyZnyj+qz8akuB60qCz+mAzHDgTO1MDM/SIrf5xoxKWvePXsxpwmX6MCZ9 F4ACgM381pK7trjgGZjbRo0il76qDdueskHsd1yoSYDSoCDEZTTzYTxqbko5UXQv+9ci PTub+4toE8orV9/mIlqwH1BosVZMmi4b9VMB8ZV+5eJMwqpZn8AbttzkKLVn90nYJYSC EqC5fB9jDXqSEvABjwwhat2LZravrbWBrKLr4xEAC/vPaPwuTuI6u8hy1FcUR6WKFu41 BhXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729107371; x=1729712171; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WBs3sIjuOq1Hz73N2mtXShFzbqAoODZKD1Xn+1XWtGU=; b=dPe27Ixu8woF+kvCn9JlJVU3UV8xzX77UVqo0rjb3upCuMXX2eTuXbPFcMNoXaBJ0U yKjdZiS+7j9WYW4WOToZaed6v/6pTztiFJGQHsgLGxp1obFtSeduix6sWfoFka580z8R 7Z/UZxPIz8F8OkI39aYA5KCNTM5qxCs+la8++A5rDphME9etCAmcHKFmNUmbl/PJkliJ W/17LE1HFSGkVJ41TldBeEkObGm0/dsmQi8LSR7LAZMkKJvm7nmCQa89DJfCPlB0D6XH xZk0B8AJLFkF2/dV1Qd2vjFJlWTj47NIg40cbBvd2wgRsXsTXOMuTWB0TWFxVfOAE0In Fn+g== X-Gm-Message-State: AOJu0Ywk0pbT0vIIW4sXPi77phOs9956gflP32NxIt2hHW3Sd+r0HvAM C7ZawzbiifOsPQX0bPxpDjyryHGlKt72To+HaIsWLL1uXhpmTCcYIxrGwA== X-Google-Smtp-Source: AGHT+IEjV5NTb3/i6BacTOuNO7NuidU73LiRasjonyIN+Rv7/nVk0WyjnLLMMLL3nGsUABHqnMYxeQ== X-Received: by 2002:a05:600c:1c9e:b0:42c:b508:750e with SMTP id 5b1f17b1804b1-431255dae1bmr180110455e9.11.1729107370532; Wed, 16 Oct 2024 12:36:10 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43158c359casm3159265e9.8.2024.10.16.12.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 12:36:10 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/5] python3-installer: add a patch to ensure RECORD file reproducibility Date: Wed, 16 Oct 2024 21:36:02 +0200 Message-Id: <20241016193606.3459951-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 16 Oct 2024 19:36:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205972 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- ...ils.py-sort-entries-before-writing-o.patch | 27 +++++++++++++++++++ .../python/python3-installer_0.7.0.bb | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/python/python3-installer/0001-src-installer-utils.py-sort-entries-before-writing-o.patch diff --git a/meta/recipes-devtools/python/python3-installer/0001-src-installer-utils.py-sort-entries-before-writing-o.patch b/meta/recipes-devtools/python/python3-installer/0001-src-installer-utils.py-sort-entries-before-writing-o.patch new file mode 100644 index 00000000000..a6715ed457d --- /dev/null +++ b/meta/recipes-devtools/python/python3-installer/0001-src-installer-utils.py-sort-entries-before-writing-o.patch @@ -0,0 +1,27 @@ +From 760ddf50ce559abd67bbdd31797267d00bcddfb3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 1 Oct 2024 19:22:11 +0200 +Subject: [PATCH] src/installer/utils.py: sort entries before writing out + RECORD file + +This helps build reproducibility. + +Upstream-Status: Submitted [https://github.com/pypa/installer/pull/245] +Signed-off-by: Alexander Kanavin +--- + src/installer/utils.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/installer/utils.py b/src/installer/utils.py +index 3e601d6..073297c 100644 +--- a/src/installer/utils.py ++++ b/src/installer/utils.py +@@ -207,7 +207,7 @@ def construct_record_file( + io.BytesIO(), encoding="utf-8", write_through=True, newline="" + ) + writer = csv.writer(stream, delimiter=",", quotechar='"', lineterminator="\n") +- for scheme, record in records: ++ for scheme, record in sorted(records, key=lambda x: x[1].path): + writer.writerow(record.to_row(prefix_for_scheme(scheme))) + stream.seek(0) + return stream.detach() diff --git a/meta/recipes-devtools/python/python3-installer_0.7.0.bb b/meta/recipes-devtools/python/python3-installer_0.7.0.bb index 9429705b1f8..6aaf1b3a379 100644 --- a/meta/recipes-devtools/python/python3-installer_0.7.0.bb +++ b/meta/recipes-devtools/python/python3-installer_0.7.0.bb @@ -6,7 +6,8 @@ BUGTRACKER = "https://github.com/pypa/installer/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5038641aec7a77451e31da828ebfae00" -SRC_URI += "file://interpreter.patch" +SRC_URI += "file://interpreter.patch \ + file://0001-src-installer-utils.py-sort-entries-before-writing-o.patch" SRC_URI[sha256sum] = "a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631" From patchwork Wed Oct 16 19:36:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 50794 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 795C1D2A555 for ; Wed, 16 Oct 2024 19:36:19 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.32034.1729107372978930200 for ; Wed, 16 Oct 2024 12:36:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=A4Cctpxb; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-37d5689eea8so95786f8f.1 for ; Wed, 16 Oct 2024 12:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729107371; x=1729712171; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VXdlfxzmpGv7a3Jjfxqabt1M51BlCg7nEFsPrm8W+90=; b=A4CctpxbWwBjNoQJ89SbDMAK5s5LSIyGpvcbcWLJnr9P2Bnuj2c7I2rpQw5A7+06IA Zo2Q3yBm/gzRcBRKom2T/dTkbvh4HQu74lTC5iw1pszC6cJl3bbGYmkhPEX2oPnZnTkK HmtYK3hmeFR8qF9mYpMbvgOKFBMTQbWhYMGiEdofTWk5+NBVJz5U1StvoXOZeQSzrbhi Cu2AHjyXOWEnP4hPf0hRyV7YaxwKHzVrsx9nZNKwr+xNqLzXa5Q1ry339TMlqhFteZmA zlmcjnWyIgFVROUJZB6jwLxFSEloXRBuo3UHdkDATk0lxslPTsNxRU6Osm5FZtHjOD9r EZ4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729107371; x=1729712171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VXdlfxzmpGv7a3Jjfxqabt1M51BlCg7nEFsPrm8W+90=; b=lvlsOhONRcodeJd8PNqzgu2h9puCq2Z2tctrMVDXYFyq7q49bDya2hrNM1ZdESz3q3 6cp2Q65I5p8WdG7MbbDh/T4uFv2+qRuZcnOvcTlnvOa823gf83m31ZXRCsUNB2aJo/Mo Up2YmX993tU1wZIMexWtuXThTFzPw9jxr9xrtwmmVjCE6OkhbbcH+stpPRDUVZVv74zA aCuVh7wPakP0N8VKeDqfmLjua5rZgYmJHbWwFm6LXiXeAOBDLuqYEOaKFaXywpTleJER 0EByCbI74LD3uKRhzUE1xM2IzZxOgog3i6v1o9mOE/IfuYfjWa8s9alLR5WaYB5GQtg0 bm6g== X-Gm-Message-State: AOJu0YxL15gFYy/7vtghRPVzInFKNqVTL97RKO08xV8lUjb9KU6Cw0ra zU1nFYX0dQVub2V0G0loS7XX8aCanHNS/95LBRT3YWw19LoWxj73g31rGQ== X-Google-Smtp-Source: AGHT+IHLmR1OD5ydOsHW6gETwv2nKJJoRq+sW1UwnwknjMCkbHxuQMQk0GU16GOI3qcpuln/IoVDaA== X-Received: by 2002:adf:fb82:0:b0:37d:4ba1:dcff with SMTP id ffacd0b85a97d-37d86d3cb40mr3228378f8f.42.1729107371049; Wed, 16 Oct 2024 12:36:11 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43158c359casm3159265e9.8.2024.10.16.12.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 12:36:10 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/5] python3-cryptography: update 42.0.8 -> 43.0.1 Date: Wed, 16 Oct 2024 21:36:03 +0200 Message-Id: <20241016193606.3459951-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241016193606.3459951-1-alex.kanavin@gmail.com> References: <20241016193606.3459951-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 16 Oct 2024 19:36:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205973 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../python/python3-cryptography-crates.inc | 130 +++++++----------- ...=> python3-cryptography-vectors_43.0.1.bb} | 2 +- ...toml-remove-benchmark-disable-option.patch | 8 +- ....0.8.bb => python3-cryptography_43.0.1.bb} | 4 +- 4 files changed, 57 insertions(+), 87 deletions(-) rename meta/recipes-devtools/python/{python3-cryptography-vectors_42.0.8.bb => python3-cryptography-vectors_43.0.1.bb} (91%) rename meta/recipes-devtools/python/{python3-cryptography_42.0.8.bb => python3-cryptography_43.0.1.bb} (91%) diff --git a/meta/recipes-devtools/python/python3-cryptography-crates.inc b/meta/recipes-devtools/python/python3-cryptography-crates.inc index dbeda05dc45..319a47dabde 100644 --- a/meta/recipes-devtools/python/python3-cryptography-crates.inc +++ b/meta/recipes-devtools/python/python3-cryptography-crates.inc @@ -2,101 +2,71 @@ # from src/rust/Cargo.lock SRC_URI += " \ - crate://crates.io/asn1/0.15.5 \ - crate://crates.io/asn1_derive/0.15.5 \ - crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/base64/0.21.7 \ - crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/bitflags/2.4.2 \ - crate://crates.io/cc/1.0.83 \ + crate://crates.io/asn1/0.16.2 \ + crate://crates.io/asn1_derive/0.16.2 \ + crate://crates.io/autocfg/1.3.0 \ + crate://crates.io/base64/0.22.1 \ + crate://crates.io/bitflags/2.6.0 \ + crate://crates.io/cc/1.1.6 \ crate://crates.io/cfg-if/1.0.0 \ crate://crates.io/foreign-types/0.3.2 \ crate://crates.io/foreign-types-shared/0.1.1 \ - crate://crates.io/heck/0.4.1 \ - crate://crates.io/indoc/2.0.4 \ - crate://crates.io/libc/0.2.152 \ - crate://crates.io/lock_api/0.4.11 \ - crate://crates.io/memoffset/0.9.0 \ + crate://crates.io/heck/0.5.0 \ + crate://crates.io/indoc/2.0.5 \ + crate://crates.io/libc/0.2.155 \ + crate://crates.io/memoffset/0.9.1 \ crate://crates.io/once_cell/1.19.0 \ - crate://crates.io/openssl/0.10.64 \ + crate://crates.io/openssl/0.10.66 \ crate://crates.io/openssl-macros/0.1.1 \ - crate://crates.io/openssl-sys/0.9.102 \ - crate://crates.io/parking_lot/0.12.1 \ - crate://crates.io/parking_lot_core/0.9.9 \ - crate://crates.io/pem/3.0.3 \ - crate://crates.io/pkg-config/0.3.29 \ - crate://crates.io/portable-atomic/1.6.0 \ - crate://crates.io/proc-macro2/1.0.78 \ - crate://crates.io/pyo3/0.20.3 \ - crate://crates.io/pyo3-build-config/0.20.3 \ - crate://crates.io/pyo3-ffi/0.20.3 \ - crate://crates.io/pyo3-macros/0.20.3 \ - crate://crates.io/pyo3-macros-backend/0.20.3 \ - crate://crates.io/quote/1.0.35 \ - crate://crates.io/redox_syscall/0.4.1 \ - crate://crates.io/scopeguard/1.2.0 \ - crate://crates.io/self_cell/1.0.3 \ - crate://crates.io/smallvec/1.13.1 \ - crate://crates.io/syn/2.0.48 \ - crate://crates.io/target-lexicon/0.12.13 \ + crate://crates.io/openssl-sys/0.9.103 \ + crate://crates.io/pem/3.0.4 \ + crate://crates.io/pkg-config/0.3.30 \ + crate://crates.io/portable-atomic/1.7.0 \ + crate://crates.io/proc-macro2/1.0.86 \ + crate://crates.io/pyo3/0.22.2 \ + crate://crates.io/pyo3-build-config/0.22.2 \ + crate://crates.io/pyo3-ffi/0.22.2 \ + crate://crates.io/pyo3-macros/0.22.2 \ + crate://crates.io/pyo3-macros-backend/0.22.2 \ + crate://crates.io/quote/1.0.36 \ + crate://crates.io/self_cell/1.0.4 \ + crate://crates.io/syn/2.0.71 \ + crate://crates.io/target-lexicon/0.12.15 \ crate://crates.io/unicode-ident/1.0.12 \ crate://crates.io/unindent/0.2.3 \ crate://crates.io/vcpkg/0.2.15 \ - crate://crates.io/windows-targets/0.48.5 \ - crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ - crate://crates.io/windows_aarch64_msvc/0.48.5 \ - crate://crates.io/windows_i686_gnu/0.48.5 \ - crate://crates.io/windows_i686_msvc/0.48.5 \ - crate://crates.io/windows_x86_64_gnu/0.48.5 \ - crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ - crate://crates.io/windows_x86_64_msvc/0.48.5 \ " -SRC_URI[asn1-0.15.5.sha256sum] = "ae3ecbce89a22627b5e8e6e11d69715617138290289e385cde773b1fe50befdb" -SRC_URI[asn1_derive-0.15.5.sha256sum] = "861af988fac460ac69a09f41e6217a8fb9178797b76fcc9478444be6a59be19c" -SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" -SRC_URI[cc-1.0.83.sha256sum] = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +SRC_URI[asn1-0.16.2.sha256sum] = "532ceda058281b62096b2add4ab00ab3a453d30dee28b8890f62461a0109ebbd" +SRC_URI[asn1_derive-0.16.2.sha256sum] = "56e6076d38cc17cc22b0f65f31170a2ee1975e6b07f0012893aefd86ce19c987" +SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +SRC_URI[cc-1.1.6.sha256sum] = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" -SRC_URI[libc-0.2.152.sha256sum] = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" -SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +SRC_URI[indoc-2.0.5.sha256sum] = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -SRC_URI[openssl-0.10.64.sha256sum] = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +SRC_URI[openssl-0.10.66.sha256sum] = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -SRC_URI[openssl-sys-0.9.102.sha256sum] = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -SRC_URI[pem-3.0.3.sha256sum] = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" -SRC_URI[pkg-config-0.3.29.sha256sum] = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" -SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" -SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" -SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" -SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" -SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" -SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -SRC_URI[self_cell-1.0.3.sha256sum] = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" -SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" -SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -SRC_URI[target-lexicon-0.12.13.sha256sum] = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +SRC_URI[openssl-sys-0.9.103.sha256sum] = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +SRC_URI[pem-3.0.4.sha256sum] = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +SRC_URI[pkg-config-0.3.30.sha256sum] = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +SRC_URI[portable-atomic-1.7.0.sha256sum] = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +SRC_URI[pyo3-0.22.2.sha256sum] = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +SRC_URI[pyo3-build-config-0.22.2.sha256sum] = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +SRC_URI[pyo3-ffi-0.22.2.sha256sum] = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +SRC_URI[pyo3-macros-0.22.2.sha256sum] = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +SRC_URI[pyo3-macros-backend-0.22.2.sha256sum] = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +SRC_URI[self_cell-1.0.4.sha256sum] = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" +SRC_URI[syn-2.0.71.sha256sum] = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +SRC_URI[target-lexicon-0.12.15.sha256sum] = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" -SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" -SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" -SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" -SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" -SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" -SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.8.bb b/meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb similarity index 91% rename from meta/recipes-devtools/python/python3-cryptography-vectors_42.0.8.bb rename to meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb index 1256e75c474..a1a10b7621b 100644 --- a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.8.bb +++ b/meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ # NOTE: Make sure to keep this recipe at the same version as python3-cryptography # Upgrade both recipes at the same time -SRC_URI[sha256sum] = "df5657367bc0a90c374309cb261009a2c53cae91a458781339a0f724f819a46a" +SRC_URI[sha256sum] = "68a0fc18fe27b309e933a293a54f3356b78a14c15207e96c9ff85681af0509de" PYPI_PACKAGE = "cryptography_vectors" diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch index 3eed171ffee..253cab60054 100644 --- a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch +++ b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch @@ -1,4 +1,4 @@ -From e4d7856fe842f3df7c614554d006d81253a5edf2 Mon Sep 17 00:00:00 2001 +From 78d8747a8a2e483ea5a4c5bca9fbe9345f0195ed Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 17 May 2022 17:22:48 +0800 Subject: [PATCH] pyproject.toml: remove --benchmark-disable option @@ -26,11 +26,11 @@ Signed-off-by: Tim Orling 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index d2e304f..10aabcf 100644 +index e5b801d..985fc8c 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -92,7 +92,7 @@ rust-version = ">=1.63.0" - +@@ -117,7 +117,7 @@ exclude = [ + ] [tool.pytest.ini_options] -addopts = "-r s --capture=no --strict-markers --benchmark-disable" diff --git a/meta/recipes-devtools/python/python3-cryptography_42.0.8.bb b/meta/recipes-devtools/python/python3-cryptography_43.0.1.bb similarity index 91% rename from meta/recipes-devtools/python/python3-cryptography_42.0.8.bb rename to meta/recipes-devtools/python/python3-cryptography_43.0.1.bb index 3f70f910d4d..af03d12a39d 100644 --- a/meta/recipes-devtools/python/python3-cryptography_42.0.8.bb +++ b/meta/recipes-devtools/python/python3-cryptography_43.0.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ " LDSHARED += "-pthread" -SRC_URI[sha256sum] = "8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2" +SRC_URI[sha256sum] = "203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d" SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ file://check-memfree.py \ @@ -17,7 +17,7 @@ SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ require ${BPN}-crates.inc -inherit pypi python_setuptools3_rust cargo-update-recipe-crates pkgconfig +inherit pypi python_maturin cargo-update-recipe-crates pkgconfig DEPENDS += " \ python3-cffi-native \ From patchwork Wed Oct 16 19:36:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 50792 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80D2CD2A558 for ; Wed, 16 Oct 2024 19:36:19 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web11.32600.1729107373382523828 for ; Wed, 16 Oct 2024 12:36:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Qz//2mPf; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43124843b04so1628715e9.2 for ; Wed, 16 Oct 2024 12:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729107372; x=1729712172; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T2DWhCmYQbNiY+zytxzo6lqX4aZl5gvX/XszO0q9FTU=; b=Qz//2mPf/Hp3obU0EOasMWltMaqiI31vm7eNycbZ/ZSttG0FtAW02FSRz3NBFVeTbd vH9U5N+nvzxgpsodcnfQhOWOcX0MEICzvMwQtlgyI+OiVPffXqym4/Pe9l48GJpLZ2PY U5S394UEFMi49oK0XLI4T2dtLYXIYoWEJdGUJkr75eRIdDAM90N6pCyvwPCwcDDa5qGx IsOYNjgL6iMTYQQGxYaw5kMkINIsMLrDi0Hs2gDuCp6b7QTBeNjO5qJ6CBB5T/2q2CEl /ij3qba2vtQiypLYnwg7QXE1j8e/bO8yVkSobtKD0wO570y9+n9zSeY21CUyzfHRAjUz ZhQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729107372; x=1729712172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T2DWhCmYQbNiY+zytxzo6lqX4aZl5gvX/XszO0q9FTU=; b=q4uzXG06qSurLrVv2yDUHpxTvgLLmg/G3YeFzOcp+15FfK4cyqpsXD8A4TPYSLE51r cYSiE8G9U24bjr+0St8OsmWIB4hTQp58PN4aj/Rx9AWBERkjtk93gausD/tDLzH1zFCr //uRUb0wPF6Rfyg/HSjrOti+aj1EHlQoscBcRfjOqgiZr2hS3ErcqSpK1Bwmuhf3DtcD qceNDuvTBhx4nUgB7yKXP4zQHYY82c3AN5U0ztSkKXKPLVhiJIpEQZ2+t6IUiE/Ws1sd GDh1KXAA6uk+lJsQR9WZpm5glOM9qfS2NUZyL6EkZnXc0e0zTBb6n/jL7FV6RTKka++o 8S9Q== X-Gm-Message-State: AOJu0Yz5GjJTVpFV98OBFw59dqZAAm+kE+gINBxI64xo94xxYQOWE8GG 0vIEOU/OhwHIJ379gxyNOO//vgvkWAui+kK+SQ/hIokFnlO5qPHEdACONw== X-Google-Smtp-Source: AGHT+IEloNprPczkCki42yy7Dus4qJmSvuNqfzl4Nf8/iUTw61oe5NH6r+Xk8J0vwpOhUmgwQOmZNA== X-Received: by 2002:a05:600c:4689:b0:431:41e2:271d with SMTP id 5b1f17b1804b1-43141e227e4mr57622845e9.6.1729107371561; Wed, 16 Oct 2024 12:36:11 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43158c359casm3159265e9.8.2024.10.16.12.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 12:36:11 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/5] python3-markupsafe: add missing html module dependency Date: Wed, 16 Oct 2024 21:36:04 +0200 Message-Id: <20241016193606.3459951-3-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241016193606.3459951-1-alex.kanavin@gmail.com> References: <20241016193606.3459951-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 16 Oct 2024 19:36:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205974 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/python/python3-markupsafe_2.1.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-markupsafe_2.1.5.bb b/meta/recipes-devtools/python/python3-markupsafe_2.1.5.bb index 821332fe7cd..ea811e3154d 100644 --- a/meta/recipes-devtools/python/python3-markupsafe_2.1.5.bb +++ b/meta/recipes-devtools/python/python3-markupsafe_2.1.5.bb @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709 PYPI_PACKAGE = "MarkupSafe" inherit pypi python_setuptools_build_meta ptest -RDEPENDS:${PN} += "python3-stringold" +RDEPENDS:${PN} += "python3-html python3-stringold" BBCLASSEXTEND = "native nativesdk" From patchwork Wed Oct 16 19:36:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 50793 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89B15D2A55A for ; Wed, 16 Oct 2024 19:36:19 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web11.32601.1729107374052419812 for ; Wed, 16 Oct 2024 12:36:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=A1uhwCff; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-37d47eff9acso67905f8f.3 for ; Wed, 16 Oct 2024 12:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729107372; x=1729712172; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eBVt/Cgr+UkE72Zafmp+z4tYaGOTE2E9nRtXxbpKQKk=; b=A1uhwCffmFPnoyBHcISJEwpQdFnBNfssP4CjDn3ygfZp1cPmsSdKYV8j+btSAo5GCF 5sleWhq1Y6bxo9aMfJuHI9bMLWQ7z2ap2TZOfA0oyh9/rT814r23pDqlWtiqNM8oTb6n r1N8BiGz84xuVIMOZm6WKQzT09ugM4+/wwxb9HHf0YmHk8IgeI5Iwx5gbC5P9RP/KJYa 8Y+xgDbmWMudXIGtlunE07SLIayk2Ln2aHIFnmmeHSaa4TgHpwNsRJedfYMknvG/D9KJ bND1Kn7iJg2Y1+OgYCfnkTDlXJ8MSRDpioY1V8ZMmMTuSKu2iVZDwtvzb9QSLYS8g4Ue 247w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729107372; x=1729712172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eBVt/Cgr+UkE72Zafmp+z4tYaGOTE2E9nRtXxbpKQKk=; b=jz3UdwgYF3bEvikQBnfBR6U/kxt1jHo78ah4fuAWPohNyZtx+4mjkAGJE5r4/C4tUI PUtu4Y/l80+kQ0LN4G81c4cBpcEHv8qx/6sHKE/eSddXQVnYvZ+2i1dBrgMaf8lx4gDX vJ44gvqIEb16MFIZ6RkZmpjOqoDOytQY6pVtls0AgGisxsAviJ+PBvr8BuylGE0mjzfG MYCqBfzU0unuTpIwsv5K5h2tErkFyKPXUHsMasrAimpybi98LQipRgLF+GNV/PWt9OUp REK1pP+6Siy6r5+/myY3cNqKWsQuEdw6a1aVpYwWRg8xzJcyKHFg+YOmK1T4pGoCiNnx Om8w== X-Gm-Message-State: AOJu0YyvhRJVOhdFHgFrr1wiJU5BDK4Y1n1CLS32jHi+K5ZIyzPSurMG /oCfdu/W/TTilpp4TE8gAupNw6fn3Ft4nLdcKjxIzJs0MTbtHp805EFZRA== X-Google-Smtp-Source: AGHT+IHeH+QQK3nwVsGKfoDa8nHKy3uUx/kWZPqkMC0vyJofUFvfd/rkUwrVum5WkeaBNuL+JQhS9A== X-Received: by 2002:a5d:56c3:0:b0:37d:5113:cdff with SMTP id ffacd0b85a97d-37d5ff6ce21mr10736427f8f.37.1729107372288; Wed, 16 Oct 2024 12:36:12 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43158c359casm3159265e9.8.2024.10.16.12.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 12:36:12 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/5] python3-jinja2: backport a patch to address python 3.13 ptest fails Date: Wed, 16 Oct 2024 21:36:05 +0200 Message-Id: <20241016193606.3459951-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241016193606.3459951-1-alex.kanavin@gmail.com> References: <20241016193606.3459951-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 16 Oct 2024 19:36:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205975 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../python/python3-jinja2/fix-3.13.patch | 87 +++++++++++++++++++ .../python/python3-jinja2_3.1.4.bb | 1 + 2 files changed, 88 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch diff --git a/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch b/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch new file mode 100644 index 00000000000..34ecd15176c --- /dev/null +++ b/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch @@ -0,0 +1,87 @@ +From cf6ba7732b49ab4637aa747186cf1d1572688584 Mon Sep 17 00:00:00 2001 +From: Thomas Grainger +Date: Mon, 13 May 2024 18:02:35 +0100 +Subject: [PATCH] fix test_package_zip_list on 3.13 + +Upstream-Status: Backport [https://github.com/pallets/jinja/pull/1979] +Signed-off-by: Alexander Kanavin +--- + src/jinja2/loaders.py | 32 ++++++++++++++++++++++++++------ + tests/test_loader.py | 4 ++-- + 2 files changed, 28 insertions(+), 8 deletions(-) + +diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py +index 9eaf647..8c2c86c 100644 +--- a/src/jinja2/loaders.py ++++ b/src/jinja2/loaders.py +@@ -238,6 +238,30 @@ class FileSystemLoader(BaseLoader): + return sorted(found) + + ++if sys.version_info >= (3, 13): ++ ++ def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]: ++ try: ++ get_files = z._get_files ++ except AttributeError as e: ++ raise TypeError( ++ "This zip import does not have the required" ++ " metadata to list templates." ++ ) from e ++ return get_files() ++else: ++ ++ def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]: ++ try: ++ files = z._files ++ except AttributeError as e: ++ raise TypeError( ++ "This zip import does not have the required" ++ " metadata to list templates." ++ ) from e ++ return files # type: ignore[no-any-return] ++ ++ + class PackageLoader(BaseLoader): + """Load templates from a directory in a Python package. + +@@ -382,11 +406,7 @@ class PackageLoader(BaseLoader): + for name in filenames + ) + else: +- if not hasattr(self._loader, "_files"): +- raise TypeError( +- "This zip import does not have the required" +- " metadata to list templates." +- ) ++ files = _get_zipimporter_files(self._loader) + + # Package is a zip file. + prefix = ( +@@ -395,7 +415,7 @@ class PackageLoader(BaseLoader): + ) + offset = len(prefix) + +- for name in self._loader._files.keys(): ++ for name in files: + # Find names under the templates directory that aren't directories. + if name.startswith(prefix) and name[-1] != os.path.sep: + results.append(name[offset:].replace(os.path.sep, "/")) +diff --git a/tests/test_loader.py b/tests/test_loader.py +index 77d686e..e0683e4 100644 +--- a/tests/test_loader.py ++++ b/tests/test_loader.py +@@ -364,8 +364,8 @@ def test_package_zip_source(package_zip_loader, template, expect): + + + @pytest.mark.xfail( +- platform.python_implementation() == "PyPy", +- reason="PyPy's zipimporter doesn't have a '_files' attribute.", ++ sys.implementation.name == "pypy", ++ reason="zipimporter doesn't have a '_files' attribute", + raises=TypeError, + ) + def test_package_zip_list(package_zip_loader): +-- +2.39.5 + diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb index f2de1983ced..a11878496c6 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb @@ -17,6 +17,7 @@ UPSTREAM_CHECK_PYPI_PACKAGE = "Jinja2" SRC_URI += " \ file://run-ptest \ + file://fix-3.13.patch \ " do_install_ptest() { From patchwork Wed Oct 16 19:36:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 50795 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79646D2A556 for ; Wed, 16 Oct 2024 19:36:19 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web10.32037.1729107375608109929 for ; Wed, 16 Oct 2024 12:36:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VGHZktT1; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-42f6bec84b5so2012905e9.1 for ; Wed, 16 Oct 2024 12:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729107374; x=1729712174; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sevE3wZ4T6LjKjAWhq3xJanIKnVp5aoS8Dr4WbB0Dy0=; b=VGHZktT1gMLg9TE525Di9p0G80n6naE4TCRWk6MyQ63jIKdjwUTIdUCUtuvLgNmQFM +jewbvyq6wb7gMhvWXG9ehVLMbVvhP4aE4U1sWPekws5tfav/IBdyAo4ELNWkXsPldo/ xckJgNlop6hZ+00jsxupcS1RTV6K582cwKVeU4GPbmzEe4J13PF0xqq2M/GM9HR0cgc1 AzPFkb5Wh5u7Ch+mtMpmN9x7Gad0ZBRXT8afwApXK3JsoFtuqJfNp5AQcHEy8nx/onRD gXip3j20E3kpR4om41mwsB+S2ac5D9kn/JD2xbTItuWHCR2s2A+nMwoXt2RoXbSX6jrW ZiYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729107374; x=1729712174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sevE3wZ4T6LjKjAWhq3xJanIKnVp5aoS8Dr4WbB0Dy0=; b=jEPEBBZhnPiER7Ca0wuGD0TXY/UvO6QV1tHZ3H9LzcYtaLs7bBrpWk7z2m1iITYitJ MtISyRARn9thR/HG60debZI3S36WOaQHbVhuY0ha1aFW7mfrs7g16nzUhWKohNyT6dWL d7oY2auSjeft4VgSROYkkAT3gBe3kQ50BB9bDTb1M9883ZeupMlH2ka1r22D19G+AUT1 apDbsW2JUZX0PYeVi9+MAK3sYB8kSY3T2woTb6e8RlGe4x0+9jwK2Xh+mgKBhwzuD1On X74NhADe7cnB1tCi7AGEc/CNf7jEipHmSDVlZO2fwSZ35YG4pG0hAj/b4OmmBxbXYdF3 J06Q== X-Gm-Message-State: AOJu0Yz867p7A8xiR8oe2FPuDA10As7AlZyrP4gUhKeu0ifaeFRuSCZ3 Bb/Ojqzvmax2Ta2uLtJXwq6PzKFeMAGjBOXt81AN5BkZCogVRMQYCLQr1g== X-Google-Smtp-Source: AGHT+IFT+k/7xz7xvB12KULausAIcjSPloSr9lwha37PqEYekFvHeu9gCkXALFqEDDxeUaObGzY3IQ== X-Received: by 2002:a05:600c:49a6:b0:431:55bf:fe4 with SMTP id 5b1f17b1804b1-43155bf1294mr13234405e9.24.1729107373296; Wed, 16 Oct 2024 12:36:13 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43158c359casm3159265e9.8.2024.10.16.12.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 12:36:12 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/5] python3: update 3.12.6 -> 3.13.0 Date: Wed, 16 Oct 2024 21:36:06 +0200 Message-Id: <20241016193606.3459951-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241016193606.3459951-1-alex.kanavin@gmail.com> References: <20241016193606.3459951-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 16 Oct 2024 19:36:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205976 From: Alexander Kanavin License-update: copyright years Update 0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch to only include tests that do not fail under qemu (following upstream change that also no longer obscures failures). Drop 0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch (backport) 0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch (fixed upstream) 0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch (code completely rewritten upstream) cgi_py.patch (cgi and cgitb modules removed upstream) Signed-off-by: Alexander Kanavin --- meta/classes-recipe/python3-dir.bbclass | 2 +- ...shebang-overflow-on-python-config.py.patch | 6 +- ...e-stdin-I-O-errors-same-way-as-maste.patch | 3 +- ...-use-prefix-value-from-build-configu.patch | 15 +- ...-qemu-wrapper-when-gathering-profile.patch | 10 +- ...sts-due-to-load-variability-on-YP-AB.patch | 16 +-- ...est_sysconfig-for-posix_user-purelib.patch | 9 +- ...e-treat-overflow-in-UID-GID-as-failu.patch | 40 ------ ...asename-to-replace-CC-for-checking-c.patch | 120 ---------------- ..._fileno-test-due-to-load-variability.patch | 10 +- ...g.py-use-platlibdir-also-for-purelib.patch | 27 ++-- ...ctive_children-skip-problematic-test.patch | 9 +- ...pes.test_find-skip-without-tools-sdk.patch | 7 +- ...-test_deadlock-skip-problematic-test.patch | 9 +- ...le.py-correct-the-test-output-format.patch | 7 +- ...t_readline-skip-limited-history-test.patch | 14 +- ...-test_shutdown-skip-problematic-test.patch | 11 +- ...orlines-skip-due-to-load-variability.patch | 7 +- ...up.py-do-not-add-a-curses-include-pa.patch | 33 ----- .../python/python3/cgi_py.patch | 32 ----- .../python/python3/crosspythonpath.patch | 7 +- .../python3/deterministic_imports.patch | 7 +- .../python/python3/fix-armv5.patch | 65 +++++++++ .../python/python3/makerace.patch | 6 +- .../python/python3/python3-manifest.json | 131 ++++-------------- .../{python3_3.12.6.bb => python3_3.13.0.bb} | 24 ++-- 26 files changed, 191 insertions(+), 436 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch delete mode 100644 meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch delete mode 100644 meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch delete mode 100644 meta/recipes-devtools/python/python3/cgi_py.patch create mode 100644 meta/recipes-devtools/python/python3/fix-armv5.patch rename meta/recipes-devtools/python/{python3_3.12.6.bb => python3_3.13.0.bb} (96%) diff --git a/meta/classes-recipe/python3-dir.bbclass b/meta/classes-recipe/python3-dir.bbclass index 3d07de99b88..0f4e7e77738 100644 --- a/meta/classes-recipe/python3-dir.bbclass +++ b/meta/classes-recipe/python3-dir.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -PYTHON_BASEVERSION = "3.12" +PYTHON_BASEVERSION = "3.13" PYTHON_ABI = "" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_PN = "python3" 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 0d807db39f7..d2246327f21 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 @@ -From 365399f17d35719d828ddd49182dcb401fb7791c Mon Sep 17 00:00:00 2001 +From 6b111a328c1c57b1580d63894b2b5d337316f6d4 Mon Sep 17 00:00:00 2001 From: Paulo Neves Date: Tue, 7 Jun 2022 16:16:41 +0200 Subject: [PATCH] Avoid shebang overflow on python-config.py @@ -16,10 +16,10 @@ Upstream-Status: Denied [distribution] 1 file changed, 2 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77bf09a..6353c57 100644 +index 9ec3a71..f7d5382 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2339,6 +2339,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh +@@ -2606,6 +2606,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh @ # Substitution happens here, as the completely-expanded BINDIR @ # is not available in configure sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py diff --git a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch index 026150f0e24..84ad2abb0bc 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch @@ -1,4 +1,4 @@ -From f8a664cf1fc73e381d57d6927207286059744837 Mon Sep 17 00:00:00 2001 +From 129ee75863081d9e3418acca3df1e47667f671ad Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 16 Sep 2021 16:35:37 +0200 Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O @@ -24,7 +24,6 @@ So let's treat both channels the same. Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388] Signed-off-by: Alexander Kanavin - --- Lib/pty.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 680254fab99..45094481a8f 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 @@ -From 71c194077bb907bfe423d3f3275f33a6c8ca0e74 Mon Sep 17 00:00:00 2001 +From 3f4f3e917950e286d5729ea949ca342995eb3c3e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 17 Nov 2023 14:26:32 +0100 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration @@ -9,16 +9,15 @@ native python. Upstream-Status: Inappropriate [oe-core cross builds] Signed-off-by: Alexander Kanavin - --- - Lib/sysconfig.py | 5 +++++ + Lib/sysconfig/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 79c0510..91ebcb6 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -668,6 +668,11 @@ def _init_config_vars(): +diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py +index f8e1c7d..0882526 100644 +--- a/Lib/sysconfig/__init__.py ++++ b/Lib/sysconfig/__init__.py +@@ -481,6 +481,11 @@ def _init_config_vars(): _CONFIG_VARS['VPATH'] = sys._vpath if os.name == 'posix': _init_posix(_CONFIG_VARS) 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 ee33128fa19..508754286fd 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,4 +1,4 @@ -From 38278339832a57dbf5fa3ef21accaa03e2c814d7 Mon Sep 17 00:00:00 2001 +From 701720a5bab5b42fd7520fd9dd95fd2c7e42c186 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 30 Jan 2019 12:41:04 +0100 Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data @@ -10,16 +10,16 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dd5e69f..381feb0 100644 +index f9932dd..be1b9ea 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -658,8 +658,7 @@ profile-run-stamp: +@@ -751,8 +751,7 @@ profile-run-stamp: # enabled. $(MAKE) profile-gen-stamp # Next, run the profile task to generate the profile information. - @ # FIXME: can't run for a cross build -- $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true -+ ./pgo-wrapper ./python -m test.regrtest --pgo test_grammar test_opcodes test_dict test_builtin test_exceptions test_types test_support || true +- $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) ++ ./pgo-wrapper ./python -m test.regrtest --pgo test_grammar test_opcodes test_dict test_types $(LLVM_PROF_MERGER) # Remove profile generation binary since we are done with it. $(MAKE) clean-retain-profile 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 197daa71a58..230e847d2bf 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 @@ -From 3471e3478e0760c42e04f8046cee2367ab5706d2 Mon Sep 17 00:00:00 2001 +From 8828a52ebace98199569404f01174398bcc64a00 Mon Sep 17 00:00:00 2001 From: Yi Fan Yu Date: Thu, 1 Apr 2021 13:08:37 -0700 Subject: [PATCH] Skip failing tests due to load variability on YP AB @@ -23,7 +23,7 @@ Signed-off-by: Trevor Gamblin 2 files changed, 5 insertions(+) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py -index e42c7ab..dff5227 100644 +index 5dae370..23eb971 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -682,6 +682,7 @@ class _TestProcess(BaseTestCase): @@ -34,7 +34,7 @@ index e42c7ab..dff5227 100644 def test_many_processes(self): if self.TYPE == 'threads': self.skipTest('test not appropriate for {}'.format(self.TYPE)) -@@ -2066,6 +2067,7 @@ class _TestBarrier(BaseTestCase): +@@ -2083,6 +2084,7 @@ class _TestBarrier(BaseTestCase): except threading.BrokenBarrierError: results.append(True) @@ -42,7 +42,7 @@ index e42c7ab..dff5227 100644 def test_timeout(self): """ Test wait(timeout) -@@ -5024,6 +5026,7 @@ class TestWait(unittest.TestCase): +@@ -5171,6 +5173,7 @@ class TestWait(unittest.TestCase): time.sleep(period) @support.requires_resource('walltime') @@ -51,10 +51,10 @@ index e42c7ab..dff5227 100644 from multiprocessing.connection import wait diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py -index 02cc3f4..51a4548 100644 +index 293799f..1dbb623 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py -@@ -492,6 +492,7 @@ class TimeTestCase(unittest.TestCase): +@@ -504,6 +504,7 @@ class TimeTestCase(unittest.TestCase): @unittest.skipIf( support.is_wasi, "process_time not available on WASI" ) @@ -62,11 +62,11 @@ index 02cc3f4..51a4548 100644 def test_process_time(self): # process_time() should not include time spend during a sleep start = time.process_time() -@@ -505,6 +506,7 @@ class TimeTestCase(unittest.TestCase): +@@ -517,6 +518,7 @@ class TimeTestCase(unittest.TestCase): self.assertTrue(info.monotonic) self.assertFalse(info.adjustable) + @unittest.skip('timing related test, dependent on load') def test_thread_time(self): if not hasattr(time, 'thread_time'): - if sys.platform.startswith(('linux', 'win')): + if sys.platform.startswith(('linux', 'android', 'win')): diff --git a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch index b6c6ac5a28a..b967a36e491 100644 --- a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch +++ b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch @@ -1,4 +1,4 @@ -From 37d058e841ba3bd89b5746cc5381afb014b11581 Mon Sep 17 00:00:00 2001 +From 5bf5aa6eae1fa3eed66893e51a1858ab481426b4 Mon Sep 17 00:00:00 2001 From: Wentao Zhang Date: Mon, 20 Mar 2023 13:39:52 +0800 Subject: [PATCH] Update test_sysconfig for posix_user purelib @@ -17,16 +17,15 @@ Update test_sysconfig.test_user_similar() for the posix_user scheme: Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Wentao Zhang - --- Lib/test/test_sysconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index b6dbf3d..5672590 100644 +index 1ade492..4e94889 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -372,7 +372,7 @@ class TestSysConfig(unittest.TestCase): +@@ -414,7 +414,7 @@ class TestSysConfig(unittest.TestCase): expected = os.path.normpath(global_path.replace(base, user, 1)) # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, # whereas posix_prefix does. @@ -34,4 +33,4 @@ index b6dbf3d..5672590 100644 + if name == 'platlib' or name == 'purelib': # Replace "/lib64/python3.11/site-packages" suffix # with "/lib/python3.11/site-packages". - py_version_short = sysconfig.get_python_version() + py_version_abi = sysconfig._get_python_version_abi() diff --git a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch deleted file mode 100644 index 88b84c60243..00000000000 --- a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001 -From: Petr Viktorin -Date: Wed, 23 Aug 2023 20:00:07 +0200 -Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to - set it (#108369) - -Upstream-Status: Backport [https://github.com/python/cpython/pull/108369] -Signed-off-by: Khem Raj ---- - Lib/tarfile.py | 3 ++- - .../Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst - -diff --git a/Lib/tarfile.py b/Lib/tarfile.py -index 3bbbcaa..473167d 100755 ---- a/Lib/tarfile.py -+++ b/Lib/tarfile.py -@@ -2557,7 +2557,8 @@ class TarFile(object): - os.lchown(targetpath, u, g) - else: - os.chown(targetpath, u, g) -- except OSError as e: -+ except (OSError, OverflowError) as e: -+ # OverflowError can be raised if an ID doesn't fit in `id_t` - raise ExtractError("could not change owner") from e - - def chmod(self, tarinfo, targetpath): -diff --git a/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst -new file mode 100644 -index 0000000..ffca413 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst -@@ -0,0 +1,3 @@ -+:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on -+an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to -+set the ID. --- -2.45.0 - 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 deleted file mode 100644 index bbeabe43896..00000000000 --- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +++ /dev/null @@ -1,120 +0,0 @@ -From ababc7b1db8c406910766e11cdd04cbef7a706c9 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 22 Oct 2018 15:19:51 +0800 -Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler - -When working path contains "clang"/"gcc"/"icc", it might be part of $CC -because of the "--sysroot" parameter. That could cause judgement error -about clang/gcc/icc compilers. e.g. -When "icc" is containded in working path, below errors are reported when -compiling python3: -x86_64-wrs-linux-gcc: error: strict: No such file or directory -x86_64-wrs-linux-gcc: error: unrecognized command line option '-fp-model' - -Here use cc_basename to replace CC for checking compiler to avoid such -kind of issue. - -Upstream-Status: Submitted [https://github.com/python/cpython/pull/96399] - -Signed-off-by: Li Zhou - -patch originally from Li Zhou, I just rework it to new version - -Signed-off-by: Changqing Li ---- - configure.ac | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 384718d..5a1d58b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,6 +137,7 @@ AC_CONFIG_HEADERS([pyconfig.h]) - AC_CANONICAL_HOST - AC_SUBST([build]) - AC_SUBST([host]) -+LT_INIT - - AS_VAR_IF([cross_compiling], [maybe], - [AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])] -@@ -896,7 +897,7 @@ AC_SUBST([CXX]) - preset_cxx="$CXX" - if test -z "$CXX" - then -- case "$CC" in -+ case "$cc_basename" in - gcc) AC_PATH_TOOL([CXX], [g++], [g++], [notfound]) ;; - cc) AC_PATH_TOOL([CXX], [c++], [c++], [notfound]) ;; - clang|*/clang) AC_PATH_TOOL([CXX], [clang++], [clang++], [notfound]) ;; -@@ -1328,7 +1329,7 @@ rmdir CaseSensitiveTestDir - - case $ac_sys_system in - hp*|HP*) -- case $CC in -+ case $cc_basename in - cc|*/cc) CC="$CC -Ae";; - esac;; - esac -@@ -1854,7 +1855,7 @@ esac - ], - [AC_MSG_RESULT([no])]) - if test "$Py_LTO" = 'true' ; then -- case $CC in -+ case $cc_basename in - *clang*) - LDFLAGS_NOLTO="-fno-lto" - dnl Clang linker requires -flto in order to link objects with LTO information. -@@ -1983,7 +1984,7 @@ then - fi - fi - LLVM_PROF_ERR=no --case $CC in -+case $cc_basename in - *clang*) - # Any changes made here should be reflected in the GCC+Darwin case below - PGO_PROF_GEN_FLAG="-fprofile-instr-generate" -@@ -2147,7 +2148,7 @@ AC_MSG_RESULT([$BOLT_APPLY_FLAGS]) - # compiler and platform. BASECFLAGS tweaks need to be made even if the - # user set OPT. - --case $CC in -+case $cc_basename in - *clang*) - cc_is_clang=1 - ;; -@@ -2419,7 +2420,7 @@ yes) - - # ICC doesn't recognize the option, but only emits a warning - ## XXX does it emit an unused result warning and can it be disabled? -- AS_CASE([$CC], -+ AS_CASE([$cc_basename], - [*icc*], [ac_cv_disable_unused_result_warning=no] - [PY_CHECK_CC_WARNING([disable], [unused-result])]) - AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes], -@@ -2665,7 +2666,7 @@ yes) - ;; - esac - --case "$CC" in -+case "$cc_basename" in - *mpicc*) - CFLAGS_NODIST="$CFLAGS_NODIST" - ;; -@@ -3482,7 +3483,7 @@ then - then - LINKFORSHARED="-Wl,--export-dynamic" - fi;; -- SunOS/5*) case $CC in -+ SunOS/5*) case $cc_basename in - *gcc*) - if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null - then -@@ -6803,7 +6804,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then - # Some versions of gcc miscompile inline asm: - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 - # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html -- case $CC in -+ case $cc_basename in - *gcc*) - AC_MSG_CHECKING([for gcc ipa-pure-const bug]) - saved_cflags="$CFLAGS" 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 2d7bca6a77c..ea103bc8341 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 @@ -From 217cea231462e7703e8c9ea39c0a6833f799a420 Mon Sep 17 00:00:00 2001 +From c5bdd39f8ebc4e6c58a47d7e424eac028eddb4ff Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Fri, 15 Sep 2023 08:48:33 -0400 Subject: [PATCH] skip no_stdout_fileno test due to load variability @@ -16,12 +16,12 @@ Signed-off-by: Trevor Gamblin 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py -index 4d03c46..b329b7a 100644 +index c5394de..ed17fb6 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py -@@ -2326,6 +2326,7 @@ class PtyTests(unittest.TestCase): - # Check stdin/stdout error handler is used when invoking PyOS_Readline() - self.check_input_tty("prompté", b"quux\xe9", "ascii") +@@ -2435,6 +2435,7 @@ class PtyTests(unittest.TestCase): + "byte 0xe9 in position 4: ordinal not in " + "range(128)") + @unittest.skip("Test may fail under heavy load") def test_input_no_stdout_fileno(self): diff --git a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch index fc52fdac26e..b9c68a98d70 100644 --- a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch +++ b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch @@ -1,4 +1,4 @@ -From a5d429a0e1a4809c1ded7be7e45dcabeb82c53d8 Mon Sep 17 00:00:00 2001 +From bbcb17dc1ed283f41c8cd94d39f70898f0c45583 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 12 Sep 2021 21:44:36 +0200 Subject: [PATCH] sysconfig.py: use platlibdir also for purelib @@ -8,21 +8,20 @@ is not correct. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin - --- - Lib/sysconfig.py | 2 +- + Lib/sysconfig/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 122d441..79c0510 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -28,7 +28,7 @@ _INSTALL_SCHEMES = { +diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py +index 80aef34..f8e1c7d 100644 +--- a/Lib/sysconfig/__init__.py ++++ b/Lib/sysconfig/__init__.py +@@ -29,7 +29,7 @@ _INSTALL_SCHEMES = { 'posix_prefix': { - 'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}', - 'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}', -- 'purelib': '{base}/lib/python{py_version_short}/site-packages', -+ 'purelib': '{base}/{platlibdir}/python{py_version_short}/site-packages', - 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages', + 'stdlib': '{installed_base}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}', + 'platstdlib': '{platbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}', +- 'purelib': '{base}/lib/{implementation_lower}{py_version_short}{abi_thread}/site-packages', ++ 'purelib': '{base}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}/site-packages', + 'platlib': '{platbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}/site-packages', 'include': - '{installed_base}/include/python{py_version_short}{abiflags}', + '{installed_base}/include/{implementation_lower}{py_version_short}{abiflags}', diff --git a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch index 6ebbaf10e0f..7749fcbe7df 100644 --- a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch @@ -1,4 +1,4 @@ -From bf3eb28bba24509a3e1cd40f1f0e26db833779a2 Mon Sep 17 00:00:00 2001 +From 540765b148d942a2339affa6c0d11445e9d0f26c Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Thu, 13 Jun 2024 10:54:31 -0400 Subject: [PATCH] test_active_children: skip problematic test @@ -14,10 +14,10 @@ Signed-off-by: Trevor Gamblin 1 file changed, 1 insertion(+) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py -index 3955123455..a1861fa3a0 100644 +index 23eb971..b1295b2 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py -@@ -579,6 +579,7 @@ def test_cpu_count(self): +@@ -579,6 +579,7 @@ class _TestProcess(BaseTestCase): self.assertTrue(type(cpus) is int) self.assertTrue(cpus >= 1) @@ -25,6 +25,3 @@ index 3955123455..a1861fa3a0 100644 def test_active_children(self): self.assertEqual(type(self.active_children()), list) --- -2.45.2 - diff --git a/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch index b4fe946cba2..68e277d662e 100644 --- a/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch +++ b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch @@ -1,4 +1,4 @@ -From b64c131a576a4b4f821514e711ab91b1394fb4ff Mon Sep 17 00:00:00 2001 +From 0e9d0c58e77ef540d9601ce84a1aa79d9ce6ee9b Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Fri, 18 Jun 2021 11:56:50 -0700 Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk @@ -10,16 +10,15 @@ easiest way to dynamically check for that is looking for Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Tim Orling - --- Lib/test/test_ctypes/test_find.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/test/test_ctypes/test_find.py b/Lib/test/test_ctypes/test_find.py -index 1ff9d01..59def26 100644 +index 85b2861..b033203 100644 --- a/Lib/test/test_ctypes/test_find.py +++ b/Lib/test/test_ctypes/test_find.py -@@ -113,10 +113,12 @@ class FindLibraryLinux(unittest.TestCase): +@@ -116,10 +116,12 @@ class FindLibraryLinux(unittest.TestCase): # LD_LIBRARY_PATH) self.assertEqual(find_library(libname), 'lib%s.so' % libname) diff --git a/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch index f0a7cfd39b2..3336e2913a1 100644 --- a/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch @@ -1,4 +1,4 @@ -From d7e3f26e7094fbe20e2271d75f18ac3b23a67f58 Mon Sep 17 00:00:00 2001 +From 5a44f74549b32395109342e9299510c32db71068 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 12 Jun 2024 10:29:03 -0400 Subject: [PATCH] test_deadlock: skip problematic test @@ -14,10 +14,10 @@ Signed-off-by: Trevor Gamblin 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py -index 1db4cd0099..fd07895a17 100644 +index 3c30c45..008d6c0 100644 --- a/Lib/test/test_concurrent_futures/test_deadlock.py +++ b/Lib/test/test_concurrent_futures/test_deadlock.py -@@ -90,6 +90,7 @@ def __reduce__(self): +@@ -90,6 +90,7 @@ class ErrorAtUnpickle(object): return _raise_error_ignore_stderr, (UnpicklingError, ) @@ -25,6 +25,3 @@ index 1db4cd0099..fd07895a17 100644 class ExecutorDeadlockTest: TIMEOUT = support.LONG_TIMEOUT --- -2.45.2 - diff --git a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch index 410a9fc7f17..7f03cf105f4 100644 --- a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch +++ b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch @@ -1,4 +1,4 @@ -From ef5728f0af14da5c9f80b0f038fe5bf6d44cb0e9 Mon Sep 17 00:00:00 2001 +From c1f3cf625c0f011060ddaa2a4096f6aa13dd1ee6 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 5 Aug 2019 15:57:39 +0800 Subject: [PATCH] test_locale.py: correct the test output format @@ -26,16 +26,15 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132] Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez Signed-off-by: Mingli Yu - --- Lib/test/test_locale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py -index b0d7998..cb12153 100644 +index da4bd79..fd9e67d 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py -@@ -557,7 +557,7 @@ class TestMiscellaneous(unittest.TestCase): +@@ -568,7 +568,7 @@ class TestMiscellaneous(unittest.TestCase): self.skipTest('test needs Turkish locale') loc = locale.getlocale(locale.LC_CTYPE) if verbose: diff --git a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch index e8d297c7219..d63c73e3340 100644 --- a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch @@ -1,4 +1,4 @@ -From d9d916d5ea946c945323679d1709de1b87029b96 Mon Sep 17 00:00:00 2001 +From 1a0a145261ba4f97aaff3c0c656ac2e0ad9695a8 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Tue, 13 Aug 2024 11:07:05 -0400 Subject: [PATCH] test_readline: skip limited history test @@ -16,11 +16,11 @@ Signed-off-by: Trevor Gamblin Lib/test/test_readline.py | 2 ++ 1 file changed, 2 insertions(+) -Index: Python-3.12.6/Lib/test/test_readline.py -=================================================================== ---- Python-3.12.6.orig/Lib/test/test_readline.py -+++ Python-3.12.6/Lib/test/test_readline.py -@@ -133,6 +133,7 @@ class TestHistoryManipulation (unittest. +diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py +index 50e77cb..09b644a 100644 +--- a/Lib/test/test_readline.py ++++ b/Lib/test/test_readline.py +@@ -133,6 +133,7 @@ class TestHistoryManipulation (unittest.TestCase): self.assertEqual(readline.get_history_item(1), "entrée 1") self.assertEqual(readline.get_history_item(2), "entrée 22") @@ -28,7 +28,7 @@ Index: Python-3.12.6/Lib/test/test_readline.py def test_write_read_limited_history(self): previous_length = readline.get_history_length() self.addCleanup(readline.set_history_length, previous_length) -@@ -371,6 +372,7 @@ readline.write_history_file(history_file +@@ -374,6 +375,7 @@ readline.write_history_file(history_file) self.assertIn(b"done", output) diff --git a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch index 1d4cda18b16..4e284de6137 100644 --- a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch @@ -1,4 +1,4 @@ -From 9d4cdbde100798ba9fa1cf3f82dbaf18fd10a543 Mon Sep 17 00:00:00 2001 +From b678363156b5d40e09c1d138840180e3ddc7d20b Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 8 May 2024 11:58:09 -0400 Subject: [PATCH] test_shutdown: skip problematic test @@ -14,7 +14,7 @@ Signed-off-by: Trevor Gamblin 1 file changed, 3 insertions(+) diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py -index 7a4065afd4..6b878a48bf 100644 +index 7a4065a..6b878a4 100644 --- a/Lib/test/test_concurrent_futures/test_shutdown.py +++ b/Lib/test/test_concurrent_futures/test_shutdown.py @@ -20,6 +20,7 @@ def sleep_and_print(t, msg): @@ -25,7 +25,7 @@ index 7a4065afd4..6b878a48bf 100644 class ExecutorShutdownTest: def test_run_after_shutdown(self): self.executor.shutdown() -@@ -156,6 +157,7 @@ def timeout(_signum, _frame): +@@ -156,6 +157,7 @@ class ExecutorShutdownTest: signal.signal(signal.SIGALRM, old_handler) @@ -33,7 +33,7 @@ index 7a4065afd4..6b878a48bf 100644 class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase): def test_threads_terminate(self): def acquire_lock(lock): -@@ -252,6 +254,7 @@ def test_cancel_futures_wait_false(self): +@@ -252,6 +254,7 @@ class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase self.assertIn(out.strip(), [b"apple", b""]) @@ -41,6 +41,3 @@ index 7a4065afd4..6b878a48bf 100644 class ProcessPoolShutdownTest(ExecutorShutdownTest): def test_processes_terminate(self): def acquire_lock(lock): --- -2.45.0 - diff --git a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch index 0d0eb08459a..b4f873fd721 100644 --- a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch +++ b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch @@ -1,4 +1,4 @@ -From dc69a1afdb3ba619705ff71e14f19ed3142e422f Mon Sep 17 00:00:00 2001 +From 9f252a691cd335341938489da32d6e2d4620d8ca Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Fri, 6 Oct 2023 10:59:44 -0400 Subject: [PATCH] test_storlines: skip due to load variability @@ -11,16 +11,15 @@ Upstream-Status: Inappropriate [OE-Specific] [YOCTO #14933] Signed-off-by: Trevor Gamblin - --- Lib/test/test_ftplib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py -index 2f191ea..dc29346 100644 +index bed0e6d..36602be 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py -@@ -626,6 +626,7 @@ class TestFTPClass(TestCase): +@@ -627,6 +627,7 @@ class TestFTPClass(TestCase): self.client.storbinary('stor', f, rest=r) self.assertEqual(self.server.handler_instance.rest, str(r)) 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 deleted file mode 100644 index 0661249bfd5..00000000000 --- a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d0205c60d08f51d84bd8ddc07a57e8c71710fdad Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 17 Nov 2023 14:16:40 +0100 -Subject: [PATCH] configure.ac: do not add a curses include path from the host - -This leads to host contamination, and particularly can cause -curses modules to fail at runtime if the host curses is configured -differently to native curses (observed on current OpenSuse Tumbleweed -as dnf failures). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - configure.ac | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c49cd4f..affdedf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6508,12 +6508,6 @@ AS_VAR_IF([have_panel], [no], [ - AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)]) - ]) - --# first curses header check --ac_save_cppflags="$CPPFLAGS" --if test "$cross_compiling" = no; then -- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" --fi -- - # On Solaris, term.h requires curses.h - AC_CHECK_HEADERS([term.h], [], [], [ - #ifdef HAVE_CURSES_H diff --git a/meta/recipes-devtools/python/python3/cgi_py.patch b/meta/recipes-devtools/python/python3/cgi_py.patch deleted file mode 100644 index 8262c88e737..00000000000 --- a/meta/recipes-devtools/python/python3/cgi_py.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a56778372fe8dc7c42f5ffd911d89498c22dd064 Mon Sep 17 00:00:00 2001 -From: Mark Hatle -Date: Wed, 21 Sep 2011 20:55:33 -0500 -Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment - -Upstream-Status: Inappropriate [distribution] - -Signed-off-by: Mark Hatle - ---- - Lib/cgi.py | 11 +---------- - 1 file changed, 1 insertion(+), 10 deletions(-) - -diff --git a/Lib/cgi.py b/Lib/cgi.py -index 8787567..ebe8652 100755 ---- a/Lib/cgi.py -+++ b/Lib/cgi.py -@@ -1,13 +1,4 @@ --#! /usr/local/bin/python -- --# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is --# intentionally NOT "/usr/bin/env python". On many systems --# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI --# scripts, and /usr/local/bin is the default directory where Python is --# installed, so /usr/bin/env would be unable to find python. Granted, --# binary installations by Linux vendors often install Python in --# /usr/bin. So let those vendors patch cgi.py to match their choice --# of installation. -+#! /usr/bin/env python - - """Support module for CGI (Common Gateway Interface) scripts. - diff --git a/meta/recipes-devtools/python/python3/crosspythonpath.patch b/meta/recipes-devtools/python/python3/crosspythonpath.patch index 2c4aef05111..f18898e4c4f 100644 --- a/meta/recipes-devtools/python/python3/crosspythonpath.patch +++ b/meta/recipes-devtools/python/python3/crosspythonpath.patch @@ -1,4 +1,4 @@ -From 5b66463c10fec1440e977d5a21a0167862d6d79c Mon Sep 17 00:00:00 2001 +From 8840438e73e43b99bc9c83896a5f950e4259738f Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Date: Tue, 18 Nov 2014 03:35:33 -0500 Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for @@ -14,16 +14,15 @@ Upstream-Status: Inappropriate [OE-Core integration specific] Credits-to: Mark Hatle Credits-to: Jackie Huang Signed-off-by: Ricardo Ribalda - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index cb9e198..d81c19a 100644 +index 58f5407..5101806 100644 --- a/configure.ac +++ b/configure.ac -@@ -165,7 +165,7 @@ AC_ARG_WITH([build-python], +@@ -164,7 +164,7 @@ AC_ARG_WITH([build-python], dnl Build Python interpreter is used for regeneration and freezing. ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python PYTHON_FOR_FREEZE="$with_build_python" diff --git a/meta/recipes-devtools/python/python3/deterministic_imports.patch b/meta/recipes-devtools/python/python3/deterministic_imports.patch index 2de6ae2e981..61f136ef42a 100644 --- a/meta/recipes-devtools/python/python3/deterministic_imports.patch +++ b/meta/recipes-devtools/python/python3/deterministic_imports.patch @@ -1,4 +1,4 @@ -From 039d5e652796b55f1132afa568c7432b6ed89afd Mon Sep 17 00:00:00 2001 +From 0a02e3b85176a5ce4dd98830bb65dac8596142e9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 May 2022 17:05:44 +0100 Subject: [PATCH] python3: Ensure stale empty python module directories don't @@ -13,16 +13,15 @@ As a result, patch this to a behaviour which works for us. Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes] Signed-off-by: Richard Purdie - --- Lib/importlib/metadata/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py -index 82e0ce1..969cac4 100644 +index 8ce62dd..a6ea6e9 100644 --- a/Lib/importlib/metadata/__init__.py +++ b/Lib/importlib/metadata/__init__.py -@@ -710,7 +710,14 @@ class Lookup: +@@ -786,7 +786,14 @@ class Lookup: self.infos = FreezableDefaultDict(list) self.eggs = FreezableDefaultDict(list) diff --git a/meta/recipes-devtools/python/python3/fix-armv5.patch b/meta/recipes-devtools/python/python3/fix-armv5.patch new file mode 100644 index 00000000000..961404b24fc --- /dev/null +++ b/meta/recipes-devtools/python/python3/fix-armv5.patch @@ -0,0 +1,65 @@ +From 18b9079ddbc149d6b99c922630c246812e4d8ae7 Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Wed, 16 Oct 2024 16:48:40 +0200 +Subject: [PATCH] [3.13] gh-125444: Fix illegal instruction for older Arm + architectures (GH-125574) (GH-125595) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On Arm v5 it is not possible to get the thread ID via c13 register +hence the illegal instruction. The c13 register started to provide +thread ID since Arm v6K architecture variant. Other variants of +Arm v6 (T2, Z and base) don’t provide the thread ID via c13. +For the sake of simplicity we group v5 and v6 together and +consider that instructions for Arm v7 only. +(cherry picked from commit feda9aa73ab95d17a291db22c416146f8e70edeb) + +Co-authored-by: Diego Russo + +Upstream-Status: Backport [https://github.com/python/cpython/commit/18b9079ddbc149d6b99c922630c246812e4d8ae7] +Signed-off-by: Alexander Kanavin +--- + Include/internal/mimalloc/mimalloc/prim.h | 4 ++-- + Include/object.h | 2 +- + .../2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst | 1 + + 3 files changed, 4 insertions(+), 3 deletions(-) + create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst + +diff --git a/Include/internal/mimalloc/mimalloc/prim.h b/Include/internal/mimalloc/mimalloc/prim.h +index 8a60d528458e6c..322ab29e6b41c2 100644 +--- a/Include/internal/mimalloc/mimalloc/prim.h ++++ b/Include/internal/mimalloc/mimalloc/prim.h +@@ -151,9 +151,9 @@ static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept { + // If you test on another platform and it works please send a PR :-) + // see also https://akkadia.org/drepper/tls.pdf for more info on the TLS register. + #elif defined(__GNUC__) && ( \ +- (defined(__GLIBC__) && (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))) \ ++ (defined(__GLIBC__) && (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__))) \ + || (defined(__APPLE__) && (defined(__x86_64__) || defined(__aarch64__))) \ +- || (defined(__BIONIC__) && (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))) \ ++ || (defined(__BIONIC__) && (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__))) \ + || (defined(__FreeBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \ + || (defined(__OpenBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \ + ) +diff --git a/Include/object.h b/Include/object.h +index 78aa7ad0f459ff..b53f9acfebdb0c 100644 +--- a/Include/object.h ++++ b/Include/object.h +@@ -259,7 +259,7 @@ _Py_ThreadId(void) + __asm__("movq %%gs:0, %0" : "=r" (tid)); // x86_64 macOSX uses GS + #elif defined(__x86_64__) + __asm__("movq %%fs:0, %0" : "=r" (tid)); // x86_64 Linux, BSD uses FS +-#elif defined(__arm__) ++#elif defined(__arm__) && __ARM_ARCH >= 7 + __asm__ ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tid)); + #elif defined(__aarch64__) && defined(__APPLE__) + __asm__ ("mrs %0, tpidrro_el0" : "=r" (tid)); +diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst +new file mode 100644 +index 00000000000000..13c1e745edf8d5 +--- /dev/null ++++ b/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst +@@ -0,0 +1 @@ ++Fix illegal instruction for older Arm architectures. Patch by Diego Russo, testing by Ross Burton. diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index c1b20703e68..f63c2307477 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch @@ -1,4 +1,4 @@ -From 9f827c29adbe656af3c8fc963fdd8f47aec0c442 Mon Sep 17 00:00:00 2001 +From 2b458b4e1bcd57e3f135d3f0e715f64b98b27906 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Jul 2021 23:19:29 +0100 Subject: [PATCH] python3: Fix make race @@ -17,10 +17,10 @@ Signed-off-by: Richard Purdie 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 381feb0..77bf09a 100644 +index be1b9ea..9ec3a71 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2250,7 +2250,7 @@ COMPILEALL_OPTS=-j0 +@@ -2513,7 +2513,7 @@ COMPILEALL_OPTS=-j0 TEST_MODULES=@TEST_MODULES@ .PHONY: libinstall diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 292c5bbc5da..4b7f9cc7e33 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -103,17 +103,6 @@ ], "cached": [] }, - "2to3": { - "summary": "Python automated Python 2 to 3 code translator", - "rdepends": [ - "core" - ], - "files": [ - "${bindir}/2to3*", - "${libdir}/python${PYTHON_MAJMIN}/lib2to3" - ], - "cached": [] - }, "asyncio": { "summary": "Python Asynchronous I/O", "rdepends": [ @@ -138,49 +127,21 @@ "core" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/chunk.py", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/audioop.*.so", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/ossaudiodev.*.so", - "${libdir}/python${PYTHON_MAJMIN}/sndhdr.py", - "${libdir}/python${PYTHON_MAJMIN}/sunau.py", "${libdir}/python${PYTHON_MAJMIN}/wave.py" ], "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/chunk.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/sndhdr.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/sunau.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/wave.*.pyc" ] }, - "cgitb": { - "summary": "Special exception handler for Python scripts", - "rdepends": [ - "core", - "crypt", - "html", - "io", - "math", - "pydoc" - ], - "files": [ - "${libdir}/python${PYTHON_MAJMIN}/cgitb.py" - ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cgitb.*.pyc" - ] - }, "codecs": { "summary": "Python codec", "rdepends": [ "core" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_multibytecodec.*.so", - "${libdir}/python${PYTHON_MAJMIN}/xdrlib.py" + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_multibytecodec.*.so" ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/xdrlib.*.pyc" - ] + "cached": [] }, "compile": { "summary": "Python bytecode compilation support", @@ -229,8 +190,12 @@ "${libdir}/python${PYTHON_MAJMIN}/_abcoll.py", "${libdir}/python${PYTHON_MAJMIN}/_bootlocale.py", "${libdir}/python${PYTHON_MAJMIN}/_collections_abc.py", + "${libdir}/python${PYTHON_MAJMIN}/_colorize.py", "${libdir}/python${PYTHON_MAJMIN}/_compression.py", "${libdir}/python${PYTHON_MAJMIN}/_markupbase.py", + "${libdir}/python${PYTHON_MAJMIN}/_opcode_metadata.py", + "${libdir}/python${PYTHON_MAJMIN}/_pyrepl", + "${libdir}/python${PYTHON_MAJMIN}/_pyrepl/pager.py", "${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.py", "${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py", "${libdir}/python${PYTHON_MAJMIN}/_weakrefset.py", @@ -261,6 +226,7 @@ "${libdir}/python${PYTHON_MAJMIN}/genericpath.py", "${libdir}/python${PYTHON_MAJMIN}/getopt.py", "${libdir}/python${PYTHON_MAJMIN}/gettext.py", + "${libdir}/python${PYTHON_MAJMIN}/glob.py", "${libdir}/python${PYTHON_MAJMIN}/heapq.py", "${libdir}/python${PYTHON_MAJMIN}/imp.py", "${libdir}/python${PYTHON_MAJMIN}/importlib", @@ -289,6 +255,7 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_typing.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/array.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/binascii.*.so", + "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/fcntl.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/grp.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/math.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/parser.*.so", @@ -307,7 +274,10 @@ "${libdir}/python${PYTHON_MAJMIN}/operator.py", "${libdir}/python${PYTHON_MAJMIN}/optparse.py", "${libdir}/python${PYTHON_MAJMIN}/os.py", + "${libdir}/python${PYTHON_MAJMIN}/pathlib", "${libdir}/python${PYTHON_MAJMIN}/pathlib.py", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/_abc.py", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/_local.py", "${libdir}/python${PYTHON_MAJMIN}/pkgutil.py", "${libdir}/python${PYTHON_MAJMIN}/platform.py", "${libdir}/python${PYTHON_MAJMIN}/posixpath.py", @@ -332,6 +302,7 @@ "${libdir}/python${PYTHON_MAJMIN}/struct.py", "${libdir}/python${PYTHON_MAJMIN}/subprocess.py", "${libdir}/python${PYTHON_MAJMIN}/symbol.py", + "${libdir}/python${PYTHON_MAJMIN}/sysconfig", "${libdir}/python${PYTHON_MAJMIN}/sysconfig.py", "${libdir}/python${PYTHON_MAJMIN}/textwrap.py", "${libdir}/python${PYTHON_MAJMIN}/threading.py", @@ -351,8 +322,10 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/__future__.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_bootlocale.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_collections_abc.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_colorize.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_compression.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_markupbase.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_opcode_metadata.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sitebuiltins.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sysconfigdata*.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_weakrefset.*.pyc", @@ -377,6 +350,7 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/genericpath.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/getopt.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/gettext.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/glob.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/heapq.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/imp.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/inspect.*.pyc", @@ -421,6 +395,8 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/typing.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/warnings.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/weakref.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/_pyrepl/__pycache__", + "${libdir}/python${PYTHON_MAJMIN}/_pyrepl/__pycache__/pager.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/collections/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/collections/__pycache__/abc.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/encodings/__pycache__", @@ -432,11 +408,15 @@ "${libdir}/python${PYTHON_MAJMIN}/importlib/__pycache__/abc.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/importlib/__pycache__/machinery.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/importlib/__pycache__/util.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/__pycache__", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/__pycache__/_abc.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/pathlib/__pycache__/_local.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_casefix.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_compiler.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_constants.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/re/__pycache__/_parser.*.pyc", + "${libdir}/python${PYTHON_MAJMIN}/sysconfig/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/urllib/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/urllib/__pycache__/parse.*.pyc" ] @@ -444,15 +424,11 @@ "crypt": { "summary": "Python basic cryptographic and hashing support", "rdepends": [ - "core", - "math", - "stringold" + "core" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/crypt.py", "${libdir}/python${PYTHON_MAJMIN}/hashlib.py", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_blake2.*.so", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_crypt.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_hashlib.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_md5.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha1.*.so", @@ -460,7 +436,6 @@ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_sha3.*.so" ], "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/crypt.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/hashlib.*.pyc" ] }, @@ -468,7 +443,6 @@ "summary": "Python C types support", "rdepends": [ "core", - "crypt", "io", "math" ], @@ -590,7 +564,6 @@ "summary": "Python email support", "rdepends": [ "core", - "crypt", "datetime", "io", "math", @@ -663,36 +636,30 @@ "core" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/colorsys.py", - "${libdir}/python${PYTHON_MAJMIN}/imghdr.py" + "${libdir}/python${PYTHON_MAJMIN}/colorsys.py" ], "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/colorsys.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/imghdr.*.pyc" + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/colorsys.*.pyc" ] }, "io": { "summary": "Python low-level I/O", "rdepends": [ "core", - "crypt", "math", - "netclient", - "shell" + "netclient" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/_pyio.py", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_socket.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_ssl.*.so", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/termios.*.so", - "${libdir}/python${PYTHON_MAJMIN}/pipes.py", "${libdir}/python${PYTHON_MAJMIN}/socket.py", "${libdir}/python${PYTHON_MAJMIN}/ssl.py", "${libdir}/python${PYTHON_MAJMIN}/tempfile.py" ], "cached": [ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/_pyio.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/pipes.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/socket.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/ssl.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/tempfile.*.pyc" @@ -728,7 +695,6 @@ "summary": "Python mailbox format support", "rdepends": [ "core", - "crypt", "datetime", "email", "io", @@ -747,8 +713,7 @@ "math": { "summary": "Python math support", "rdepends": [ - "core", - "crypt" + "core" ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_random.*.so", @@ -765,12 +730,10 @@ "core" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/quopri.py", - "${libdir}/python${PYTHON_MAJMIN}/uu.py" + "${libdir}/python${PYTHON_MAJMIN}/quopri.py" ], "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/quopri.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/uu.*.pyc" + "${libdir}/python${PYTHON_MAJMIN}/__pycache__/quopri.*.pyc" ] }, "mmap": { @@ -787,7 +750,6 @@ "cached": [], "files": [], "rdepends": [ - "2to3", "asyncio", "audio", "codecs", @@ -884,11 +846,9 @@ "${libdir}/python${PYTHON_MAJMIN}/http/__pycache__", "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_uuid.*.so", "${libdir}/python${PYTHON_MAJMIN}/mimetypes.py", - "${libdir}/python${PYTHON_MAJMIN}/nntplib.py", "${libdir}/python${PYTHON_MAJMIN}/poplib.py", "${libdir}/python${PYTHON_MAJMIN}/secrets.py", "${libdir}/python${PYTHON_MAJMIN}/smtplib.py", - "${libdir}/python${PYTHON_MAJMIN}/telnetlib.py", "${libdir}/python${PYTHON_MAJMIN}/urllib", "${libdir}/python${PYTHON_MAJMIN}/uuid.py" ], @@ -897,11 +857,9 @@ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/ftplib.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/hmac.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/mimetypes.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/nntplib.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/poplib.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/secrets.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/smtplib.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/telnetlib.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/uuid.*.pyc" ] }, @@ -909,22 +867,12 @@ "summary": "Python Internet Protocol servers", "rdepends": [ "core", - "crypt", - "datetime", - "email", - "html", - "io", - "math", - "mime", - "netclient", - "stringold" + "io" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/cgi.py", "${libdir}/python${PYTHON_MAJMIN}/socketserver.py" ], "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cgi.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/socketserver.*.pyc" ] }, @@ -1052,12 +1000,10 @@ ], "files": [ "${libdir}/python${PYTHON_MAJMIN}/cmd.py", - "${libdir}/python${PYTHON_MAJMIN}/glob.py", "${libdir}/python${PYTHON_MAJMIN}/shlex.py" ], "cached": [ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/cmd.*.pyc", - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/glob.*.pyc", "${libdir}/python${PYTHON_MAJMIN}/__pycache__/shlex.*.pyc" ] }, @@ -1077,7 +1023,6 @@ "summary": "Basic statistics module", "rdepends": [ "core", - "crypt", "math", "numbers" ], @@ -1147,7 +1092,6 @@ "core" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/_tkinter.*.so", "${libdir}/python${PYTHON_MAJMIN}/tkinter" ], "cached": [] @@ -1162,18 +1106,6 @@ ], "cached": [] }, - "turtle": { - "summary": "Turtle graphics is a popular way for introducing programming to kids.", - "rdepends": [ - "tkinter" - ], - "files": [ - "${libdir}/python${PYTHON_MAJMIN}/turtle.py" - ], - "cached": [ - "${libdir}/python${PYTHON_MAJMIN}/__pycache__/turtle.*.pyc" - ] - }, "unittest": { "summary": "Python unit testing framework", "rdepends": [ @@ -1201,8 +1133,7 @@ "io" ], "files": [ - "${libdir}/python${PYTHON_MAJMIN}/getpass.py", - "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/nis.*.so" + "${libdir}/python${PYTHON_MAJMIN}/getpass.py" ], "cached": [ "${libdir}/python${PYTHON_MAJMIN}/__pycache__/getpass.*.pyc" @@ -1238,12 +1169,10 @@ "rdepends": [ "compression", "core", - "crypt", "datetime", "email", "html", "io", - "math", "mime", "netclient", "netserver", diff --git a/meta/recipes-devtools/python/python3_3.12.6.bb b/meta/recipes-devtools/python/python3_3.13.0.bb similarity index 96% rename from meta/recipes-devtools/python/python3_3.12.6.bb rename to meta/recipes-devtools/python/python3_3.13.0.bb index 858124d104f..54742f5257b 100644 --- a/meta/recipes-devtools/python/python3_3.12.6.bb +++ b/meta/recipes-devtools/python/python3_3.13.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly LICENSE = "PSF-2.0" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3f64a4ff490f884d562feb77bf2435f1" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://run-ptest \ @@ -13,12 +13,9 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://python3-manifest.json \ file://check_build_completeness.py \ file://reformat_sysconfig.py \ - file://cgi_py.patch \ file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \ - file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ file://crosspythonpath.patch \ file://0001-test_locale.py-correct-the-test-output-format.patch \ - file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \ file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch \ file://makerace.patch \ @@ -30,17 +27,17 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ file://0001-test_storlines-skip-due-to-load-variability.patch \ file://0001-test_shutdown-skip-problematic-test.patch \ - file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ - file://0001-test_deadlock-skip-problematic-test.patch \ - file://0001-test_active_children-skip-problematic-test.patch \ + file://0001-test_deadlock-skip-problematic-test.patch \ + file://0001-test_active_children-skip-problematic-test.patch \ file://0001-test_readline-skip-limited-history-test.patch \ + file://fix-armv5.patch \ " SRC_URI:append:class-native = " \ file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ " -SRC_URI[sha256sum] = "1999658298cf2fb837dffed8ff3c033ef0c98ef20cf73c5d5f66bed5ab89697c" +SRC_URI[sha256sum] = "086de5882e3cb310d4dca48457522e2e48018ecd43da9cdf827f6a0759efb07d" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" @@ -55,7 +52,7 @@ CVE_STATUS[CVE-2022-26488] = "not-applicable-platform: Issue only applies on Win CVE_STATUS[CVE-2015-20107] = "upstream-wontfix: The mailcap module is insecure by design, so this can't be fixed in a meaningful way" CVE_STATUS[CVE-2023-36632] = "disputed: Not an issue, in fact expected behaviour" -PYTHON_MAJMIN = "3.12" +PYTHON_MAJMIN = "3.13" S = "${WORKDIR}/Python-${PV}" @@ -91,6 +88,10 @@ CACHED_CONFIGUREVARS = " \ ac_cv_file__dev_ptc=no \ ac_cv_working_tzset=yes \ " +CACHED_CONFIGUREVARS:append:class-target = " \ + ac_cv_libatomic_needed=yes \ +" + # set thread stack size to 2MB on musl for interpreter and stdlib C extensions # so it does not run into stack limits due to musl's small thread stack # This is only needed to build interpreter and not the subsequent modules @@ -384,6 +385,7 @@ python(){ # Prepending so to avoid python-misc getting everything packages = newpackages + packages d.setVar('PACKAGES', ' '.join(packages)) + d.setVar('ALLOW_EMPTY:${PN}-fcntl', '1') d.setVar('ALLOW_EMPTY:${PN}-modules', '1') d.setVar('ALLOW_EMPTY:${PN}-pkgutil', '1') @@ -403,6 +405,8 @@ do_create_manifest() { # be present, we must ensure it is. cp ${UNPACKDIR}/create_manifest3.py ${WORKDIR} + cp ${UNPACKDIR}/python3-manifest.json ${WORKDIR} + cp ${UNPACKDIR}/get_module_deps3.py ${WORKDIR} cd ${WORKDIR} # This needs to be executed by python-native and NOT by HOST's python nativepython3 create_manifest3.py ${PYTHON_MAJMIN} @@ -458,7 +462,7 @@ FILES:${PN}-man = "${datadir}/man" # See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395 RDEPENDS:libpython3:append:libc-glibc = " libgcc" RDEPENDS:${PN}-ctypes:append:libc-glibc = " ${MLPREFIX}ldconfig" -RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-cgitb ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed gcc g++ binutils \ +RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed gcc g++ binutils \ locale-base-fr-fr locale-base-en-us locale-base-de-de" RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-tr-tr" RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}"