From: Alexander Kanavin <[email protected]>
Signed-off-by: Alexander Kanavin <[email protected]>
---
.../python/python3-cryptography-common.inc | 6 ++++++
.../python/python3-cryptography-crates.inc | 8 ++++----
...-vectors_43.0.1.bb => python3-cryptography-vectors.bb} | 8 ++------
...on3-cryptography_43.0.1.bb => python3-cryptography.bb} | 5 ++++-
...1-pyproject.toml-remove-benchmark-disable-option.patch | 4 ++--
5 files changed, 18 insertions(+), 13 deletions(-)
create mode 100644 meta/recipes-devtools/python/python3-cryptography-common.inc
rename meta/recipes-devtools/python/{python3-cryptography-vectors_43.0.1.bb =>
python3-cryptography-vectors.bb} (77%)
rename meta/recipes-devtools/python/{python3-cryptography_43.0.1.bb =>
python3-cryptography.bb} (87%)
diff --git a/meta/recipes-devtools/python/python3-cryptography-common.inc
b/meta/recipes-devtools/python/python3-cryptography-common.inc
new file mode 100644
index 00000000000..288f4c9f703
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-cryptography-common.inc
@@ -0,0 +1,6 @@
+# Sharing PV between cryptography and cryptography-vectors will
+# ensure that updating one but not the other will cause a build error.
+#
+# Additionally AUH will detect that they share this .inc file and
+# perform a lockstep upgrade for both.
+PV = "43.0.3"
diff --git a/meta/recipes-devtools/python/python3-cryptography-crates.inc
b/meta/recipes-devtools/python/python3-cryptography-crates.inc
index 319a47dabde..b30d96eea10 100644
--- a/meta/recipes-devtools/python/python3-cryptography-crates.inc
+++ b/meta/recipes-devtools/python/python3-cryptography-crates.inc
@@ -16,9 +16,9 @@ SRC_URI += " \
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.66 \
+ crate://crates.io/openssl/0.10.68 \
crate://crates.io/openssl-macros/0.1.1 \
- crate://crates.io/openssl-sys/0.9.103 \
+ crate://crates.io/openssl-sys/0.9.104 \
crate://crates.io/pem/3.0.4 \
crate://crates.io/pkg-config/0.3.30 \
crate://crates.io/portable-atomic/1.7.0 \
@@ -51,9 +51,9 @@ SRC_URI[indoc-2.0.5.sha256sum] =
"b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03
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.66.sha256sum] =
"9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+SRC_URI[openssl-0.10.68.sha256sum] =
"6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
SRC_URI[openssl-macros-0.1.1.sha256sum] =
"a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-SRC_URI[openssl-sys-0.9.103.sha256sum] =
"7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+SRC_URI[openssl-sys-0.9.104.sha256sum] =
"45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
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"
diff --git
a/meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb
b/meta/recipes-devtools/python/python3-cryptography-vectors.bb
similarity index 77%
rename from meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb
rename to meta/recipes-devtools/python/python3-cryptography-vectors.bb
index 1ad9a8ab867..02d10dbfa73 100644
--- a/meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb
+++ b/meta/recipes-devtools/python/python3-cryptography-vectors.bb
@@ -8,8 +8,8 @@ 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] =
"68a0fc18fe27b309e933a293a54f3356b78a14c15207e96c9ff85681af0509de"
+require python3-cryptography-common.inc
+SRC_URI[sha256sum] =
"ff6a885265f484e8907277614b73e9c774b01658623ad763dde2858188e486b4"
PYPI_PACKAGE = "cryptography_vectors"
@@ -20,7 +20,3 @@ DEPENDS += " \
"
BBCLASSEXTEND = "native nativesdk"
-
-UPSTREAM_CHECK_REGEX = ""
-
-RECIPE_NO_UPDATE_REASON = "Must be updated in sync with python3-cryptography."
diff --git a/meta/recipes-devtools/python/python3-cryptography_43.0.1.bb
b/meta/recipes-devtools/python/python3-cryptography.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-cryptography_43.0.1.bb
rename to meta/recipes-devtools/python/python3-cryptography.bb
index af03d12a39d..484dc1129af 100644
--- a/meta/recipes-devtools/python/python3-cryptography_43.0.1.bb
+++ b/meta/recipes-devtools/python/python3-cryptography.bb
@@ -8,7 +8,10 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \
"
LDSHARED += "-pthread"
-SRC_URI[sha256sum] =
"203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d"
+# NOTE: Make sure to keep this recipe at the same version as
python3-cryptography-vectors
+# Upgrade both recipes at the same time
+require python3-cryptography-common.inc
+SRC_URI[sha256sum] =
"315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805"
SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \
file://check-memfree.py \
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 253cab60054..4dcaa5d8d46 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 78d8747a8a2e483ea5a4c5bca9fbe9345f0195ed Mon Sep 17 00:00:00 2001
+From e12a40966069083ed0a3dd270d9271f9cd5a5941 Mon Sep 17 00:00:00 2001
From: Mingli Yu <[email protected]>
Date: Tue, 17 May 2022 17:22:48 +0800
Subject: [PATCH] pyproject.toml: remove --benchmark-disable option
@@ -26,7 +26,7 @@ Signed-off-by: Tim Orling <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
-index e5b801d..985fc8c 100644
+index 03b178d..2ddcb48 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -117,7 +117,7 @@ exclude = [
--
2.39.5
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#207766):
https://lists.openembedded.org/g/openembedded-core/message/207766
Mute This Topic: https://lists.openembedded.org/mt/109769675/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
