Skip to contentSkip to conversation

arm/pyhsslms: update to 2.0.0

PATCH Applied Jon Mason 2 participants 3 messages Jan 15, 2024 – Jan 16, 2024

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/2 arm/pyhsslms: update to 2.0.0

Changes were needed due to the 2.0.0 version not being available for download at pypi (though listed as the latest version there).

---
 .../python/python3-pyhsslms_1.1.1.bb               | 10 ----------
 .../python/python3-pyhsslms_2.0.0.bb               | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 meta-arm/recipes-devtools/python/python3-pyhsslms_1.1.1.bb
 create mode 100644 meta-arm/recipes-devtools/python/python3-pyhsslms_2.0.0.bb
meta-arm/recipes-devtools/python/python3-pyhsslms_1.1.1.bb deleted +0 -10
deleted file mode 100644
index 6012ab2d6cea..000000000000
@@ -1,10 +0,0 @@
-SUMMARY = "Pure-Python implementation of HSS/LMS Digital Signatures (RFC 8554)"
-HOMEPAGE ="https://pypi.org/project/pyhsslms"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=58f6f7065b99f9d01d56e759256a6f1b"
-
-inherit pypi python_setuptools_build_meta
-PYPI_PACKAGE = "pyhsslms"
-SRC_URI[sha256sum] = "58bf03e34c6f9d5a3cfd77875d0a1356d4f23d7ad6ffd129b1e60de1208db753"
-
-BBCLASSEXTEND = "native nativesdk"
meta-arm/recipes-devtools/python/python3-pyhsslms_2.0.0.bb new file +14 -0
new file mode 100644
index 000000000000..b18d1c8e8685
@@ -0,0 +1,14 @@
+SUMMARY = "Pure-Python implementation of HSS/LMS Digital Signatures (RFC 8554)"
+HOMEPAGE ="https://pypi.org/project/pyhsslms"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bbc59ef8bf238c2902ca816b87b58571"
+
+inherit python_setuptools_build_meta
+
+# Maintainer refused to upload source to pypi.org, but said he would in a future release.  In the meantime, do github
+SRC_URI = "git:///github.com/russhousley/pyhsslms.git;branch=master;protocol=https"
+SRCREV = "c798728deed6d3f681c9e6bfd7fe8a6705f5638b"
+
+S = "${WORKDIR}/git"
+
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.39.3 (Apple Git-145)
author
#1 lore raw

PATCH 2/2 arm/trusted-firmware-m: update to 2.0.0

Updated to the latest version. Corstone1000 doesn't seem to boot. So, pull back the old version to meta-arm-bsp for it to use temporarily.

---
 .../conf/machine/include/corstone1000.inc     |  3 +-
 .../trusted-firmware-m-1.8.1-src.inc          |  0
 ...trusted-firmware-m-scripts-native_1.8.1.bb |  0
 .../trusted-firmware-m_1.8.1.bb               |  0
 .../trusted-firmware-m-2.0.0-src.inc          | 46 +++++++++++++++++++
 ...trusted-firmware-m-scripts-native_2.0.0.bb |  2 +
 .../trusted-firmware-m_2.0.0.bb               |  2 +
 7 files changed, 52 insertions(+), 1 deletion(-)
 rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb (100%)
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb
meta-arm-bsp/conf/machine/include/corstone1000.inc +2 -1
index 381eaaf36514..d03c23c09c7c 100644
@@ -12,7 +12,8 @@ TFA_BL2_BINARY = "bl2-corstone1000.bin"
 TFA_FIP_BINARY = "fip-corstone1000.bin"
 
 # TF-M
-EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m"
+EXTRA_IMAGEDEPENDS += "trusted-firmware-m"
+PREFERRED_VERSION_trusted-firmware-m ?= "1.8.%"
 
 # TF-M settings for signing host images
 TFA_BL2_RE_IMAGE_LOAD_ADDRESS = "0x62353000"
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc +0 -0
similarity index 100%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb
meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb renamed from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc new file +46 -0

46 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb new file +2 -0
new file mode 100644
index 000000000000..d50d886f60b2
@@ -0,0 +1,2 @@
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native.inc
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb new file +2 -0
new file mode 100644
index 000000000000..3464f49dd9d1
@@ -0,0 +1,2 @@
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc
+require recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc
Signature · 1 line
2.39.3 (Apple Git-145)
Applied
#2 lore raw
In reply to Jon Mason
Quoted 4 lines · Jon Mason

Changes were needed due to the 2.0.0 version not being available for download at pypi (though listed as the latest version there).

Applied, thanks!

[1/2] arm/pyhsslms: update to 2.0.0

      commit: 8127e49f6bdba89a43f9c8c46d9116af3628622a
[2/2] arm/trusted-firmware-m: update to 2.0.0
      commit: c538ae49eea67a7ebcc9d77137a459a4b68edcf8

Best regards,

Signature · 1 line
Jon Mason <[email protected]>