Skip to contentSkip to conversation

arm/opencsd: update to 1.8.3

PATCH New Jon Mason 1 participant 2 messages Jul 14

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/2 arm/opencsd: update to 1.8.3

---
 .../opencsd/{opencsd_1.8.2.bb => opencsd_1.8.3.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-arm/recipes-devtools/opencsd/{opencsd_1.8.2.bb => opencsd_1.8.3.bb} (95%)
meta-arm/recipes-devtools/opencsd/opencsd_1.8.3.bb renamed from meta-arm/recipes-devtools/opencsd/opencsd_1.8.2.bb +1 -1
similarity index 95%
rename from meta-arm/recipes-devtools/opencsd/opencsd_1.8.2.bb
rename to meta-arm/recipes-devtools/opencsd/opencsd_1.8.3.bb
index 0a0c7cd62ebf..c18acd313fdb 100644
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
 
 SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https;branch=master"
-SRCREV = "9b462f77a4e1c6ab363fafe8f1f5d7374f5782b5"
+SRCREV = "59f15320637ce6e510604e7bed550d7ad109d15d"
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
Signature · 1 line
2.50.1 (Apple Git-155)
author
#1 lore raw

PATCH 2/2 arm/optee-ftpm: update recipe name

optee-ftpm tagged the 4.10 release, but had no functional changes (that is, they tagged the same commit of 4.9.0 with 4.10.0). Update the recipe name to match the latest version, and not have people think that one package was held back.

Also, modify the version checking to be less incorrect

---
 .../{optee-ftpm_4.9.0.bb => optee-ftpm_4.10.0.bb}          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename meta-arm/recipes-security/optee-ftpm/{optee-ftpm_4.9.0.bb => optee-ftpm_4.10.0.bb} (93%)
meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.10.0.bb renamed from meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.9.0.bb +5 -2
similarity index 93%
rename from meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.9.0.bb
rename to meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.10.0.bb
index 0cbefceeec8b..9a58f7bc0753 100644
@@ -33,12 +33,15 @@ SRC_URI = "\
 # As per optee-ftpm TA documentation, we have to use this SHA of MS TPM reference
 SRCREV_ms-tpm   ?= "98b60a44aba79b15fcce1c0d1e46cf5918400f6a"
 
-# v4.9.0
+# v4.10.0
 SRCREV_optee-ta ?= "a09269b15de635e1816fe832e26adfbfb44c5455"
 
 SRCREV_FORMAT    = "ms-tpm_optee-ta"
 
-UPSTREAM_CHECK_COMMITS = "1"
+# Because of the OPTEE portion being put inside of the ms-tpm, the
+# tooling usings the ms-tpm source for version and not the optee-ta.
+# So, disable checking
+UPSTREAM_VERSION_UNKNOWN = "1"
 
 S = "${UNPACKDIR}/ms-tpm"
 
Signature · 1 line
2.50.1 (Apple Git-155)