@@ -21,4 +21,8 @@ LAYERDEPENDS_meta-arm-bsp:append:musca-s1 = " meta-python"
LICENSE_PATH += "${LAYERDIR}/custom-licenses"
# Delete this when our downgrade of python3-cryptography is removed
-BBMASK += "meta-arm-bsp/recipes-devtools/python/python3-cryptography_3.3.2.bb"
+META_ARM_PYCRYPTO = "meta-arm-bsp/recipes-devtools/python/python3-cryptography_3.3.2.bb"
+META_ARM_PYCRYPTO:corstone1000 = ""
+META_ARM_PYCRYPTO:musca-b1 = ""
+META_ARM_PYCRYPTO:musca-s1 = ""
+BBMASK += "${META_ARM_PYCRYPTO}"
@@ -63,3 +63,8 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0"
WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
WKS_FILE ?= "corstone1000-image.corstone1000.wks"
+
+# The latest python3-cryptography-native doesn't work
+# (cryptography.exceptions.InternalError: Unknown OpenSSL error) so use the
+# version before Rust was involved for now.
+PREFERRED_VERSION_python3-cryptography-native = "3.3.2"
@@ -26,3 +26,8 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
ARCH:musca-b1 = "arm"
TFM_PLATFORM = "arm/musca_b1/sse_200"
+
+# The latest python3-cryptography-native doesn't work
+# (cryptography.exceptions.InternalError: Unknown OpenSSL error) so use the
+# version before Rust was involved for now.
+PREFERRED_VERSION_python3-cryptography-native = "3.3.2"
@@ -25,3 +25,8 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
ARCH:musca-s1 = "arm"
TFM_PLATFORM = "arm/musca_s1"
+
+# The latest python3-cryptography-native doesn't work
+# (cryptography.exceptions.InternalError: Unknown OpenSSL error) so use the
+# version before Rust was involved for now.
+PREFERRED_VERSION_python3-cryptography-native = "3.3.2"
As the latest python3-crytography breaks TF-M builds, downgrade those machines using TF-M (musca and corstone) to python3-crytography-native 3.3.2 temporarily. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta-arm-bsp/conf/layer.conf | 6 +++++- meta-arm-bsp/conf/machine/include/corstone1000.inc | 5 +++++ meta-arm-bsp/conf/machine/musca-b1.conf | 5 +++++ meta-arm-bsp/conf/machine/musca-s1.conf | 5 +++++ 4 files changed, 20 insertions(+), 1 deletion(-)