diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2024-11-25 13:01:11 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-11-27 14:58:48 +0000 |
| commit | e7c6cf30de1f65aa9613248f40ec7c1f8fd94da9 (patch) | |
| tree | 6345741702a55ccde7e5efb70e596c373b2b3e12 /meta/recipes-devtools/python | |
| parent | b29198442c6eb6fea0bcb0959c6e3077f174ae66 (diff) | |
| download | poky-e7c6cf30de1f65aa9613248f40ec7c1f8fd94da9.tar.gz | |
python3-cryptography(-vectors): upgrade 43.0.1 -> 43.0.3, ensure lockstep upgrades
(From OE-Core rev: 7a39814530cc0d6bfdd90382ad918c24aa345a0a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
| -rw-r--r-- | meta/recipes-devtools/python/python3-cryptography-common.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-cryptography-crates.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-cryptography-vectors.bb (renamed from meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb) | 8 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-cryptography.bb (renamed from meta/recipes-devtools/python/python3-cryptography_43.0.1.bb) | 5 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch | 4 |
5 files changed, 18 insertions, 13 deletions
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 0000000000..288f4c9f70 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography-common.inc | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | # Sharing PV between cryptography and cryptography-vectors will | ||
| 2 | # ensure that updating one but not the other will cause a build error. | ||
| 3 | # | ||
| 4 | # Additionally AUH will detect that they share this .inc file and | ||
| 5 | # perform a lockstep upgrade for both. | ||
| 6 | 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 319a47dabd..b30d96eea1 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 += " \ | |||
| 16 | crate://crates.io/libc/0.2.155 \ | 16 | crate://crates.io/libc/0.2.155 \ |
| 17 | crate://crates.io/memoffset/0.9.1 \ | 17 | crate://crates.io/memoffset/0.9.1 \ |
| 18 | crate://crates.io/once_cell/1.19.0 \ | 18 | crate://crates.io/once_cell/1.19.0 \ |
| 19 | crate://crates.io/openssl/0.10.66 \ | 19 | crate://crates.io/openssl/0.10.68 \ |
| 20 | crate://crates.io/openssl-macros/0.1.1 \ | 20 | crate://crates.io/openssl-macros/0.1.1 \ |
| 21 | crate://crates.io/openssl-sys/0.9.103 \ | 21 | crate://crates.io/openssl-sys/0.9.104 \ |
| 22 | crate://crates.io/pem/3.0.4 \ | 22 | crate://crates.io/pem/3.0.4 \ |
| 23 | crate://crates.io/pkg-config/0.3.30 \ | 23 | crate://crates.io/pkg-config/0.3.30 \ |
| 24 | crate://crates.io/portable-atomic/1.7.0 \ | 24 | crate://crates.io/portable-atomic/1.7.0 \ |
| @@ -51,9 +51,9 @@ SRC_URI[indoc-2.0.5.sha256sum] = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03 | |||
| 51 | SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" | 51 | SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" |
| 52 | SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" | 52 | SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" |
| 53 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" | 53 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
| 54 | SRC_URI[openssl-0.10.66.sha256sum] = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" | 54 | SRC_URI[openssl-0.10.68.sha256sum] = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" |
| 55 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" | 55 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" |
| 56 | SRC_URI[openssl-sys-0.9.103.sha256sum] = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" | 56 | SRC_URI[openssl-sys-0.9.104.sha256sum] = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" |
| 57 | SRC_URI[pem-3.0.4.sha256sum] = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" | 57 | SRC_URI[pem-3.0.4.sha256sum] = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" |
| 58 | SRC_URI[pkg-config-0.3.30.sha256sum] = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" | 58 | SRC_URI[pkg-config-0.3.30.sha256sum] = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" |
| 59 | SRC_URI[portable-atomic-1.7.0.sha256sum] = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" | 59 | 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 index 1ad9a8ab86..02d10dbfa7 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 \ | |||
| 8 | 8 | ||
| 9 | # NOTE: Make sure to keep this recipe at the same version as python3-cryptography | 9 | # NOTE: Make sure to keep this recipe at the same version as python3-cryptography |
| 10 | # Upgrade both recipes at the same time | 10 | # Upgrade both recipes at the same time |
| 11 | 11 | require python3-cryptography-common.inc | |
| 12 | SRC_URI[sha256sum] = "68a0fc18fe27b309e933a293a54f3356b78a14c15207e96c9ff85681af0509de" | 12 | SRC_URI[sha256sum] = "ff6a885265f484e8907277614b73e9c774b01658623ad763dde2858188e486b4" |
| 13 | 13 | ||
| 14 | PYPI_PACKAGE = "cryptography_vectors" | 14 | PYPI_PACKAGE = "cryptography_vectors" |
| 15 | 15 | ||
| @@ -20,7 +20,3 @@ DEPENDS += " \ | |||
| 20 | " | 20 | " |
| 21 | 21 | ||
| 22 | BBCLASSEXTEND = "native nativesdk" | 22 | BBCLASSEXTEND = "native nativesdk" |
| 23 | |||
| 24 | UPSTREAM_CHECK_REGEX = "" | ||
| 25 | |||
| 26 | 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 index af03d12a39..484dc1129a 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 \ | |||
| 8 | " | 8 | " |
| 9 | LDSHARED += "-pthread" | 9 | LDSHARED += "-pthread" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d" | 11 | # NOTE: Make sure to keep this recipe at the same version as python3-cryptography-vectors |
| 12 | # Upgrade both recipes at the same time | ||
| 13 | require python3-cryptography-common.inc | ||
| 14 | SRC_URI[sha256sum] = "315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805" | ||
| 12 | 15 | ||
| 13 | SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ | 16 | SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ |
| 14 | file://check-memfree.py \ | 17 | 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 253cab6005..4dcaa5d8d4 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 @@ | |||
| 1 | From 78d8747a8a2e483ea5a4c5bca9fbe9345f0195ed Mon Sep 17 00:00:00 2001 | 1 | From e12a40966069083ed0a3dd270d9271f9cd5a5941 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Tue, 17 May 2022 17:22:48 +0800 | 3 | Date: Tue, 17 May 2022 17:22:48 +0800 |
| 4 | Subject: [PATCH] pyproject.toml: remove --benchmark-disable option | 4 | Subject: [PATCH] pyproject.toml: remove --benchmark-disable option |
| @@ -26,7 +26,7 @@ Signed-off-by: Tim Orling <tim.orling@konsulko.com> | |||
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) | 26 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 27 | 27 | ||
| 28 | diff --git a/pyproject.toml b/pyproject.toml | 28 | diff --git a/pyproject.toml b/pyproject.toml |
| 29 | index e5b801d..985fc8c 100644 | 29 | index 03b178d..2ddcb48 100644 |
| 30 | --- a/pyproject.toml | 30 | --- a/pyproject.toml |
| 31 | +++ b/pyproject.toml | 31 | +++ b/pyproject.toml |
| 32 | @@ -117,7 +117,7 @@ exclude = [ | 32 | @@ -117,7 +117,7 @@ exclude = [ |
