Re: [PATCH v2 1/3] arm/arm-bsp: optee: add version 4.9.0

Hi Hugues,

On 1/26/26 6:16 PM, Hugues KAMBA MPIANA wrote:
[...]
> diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.9.0.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.9.0.bb
> new file mode 100644
> index 00000000..5dfc88c6
> --- /dev/null
> +++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.9.0.bb
> @@ -0,0 +1,94 @@
> +SUMMARY = "OPTEE fTPM Microsoft TA"
> +DESCRIPTION = "TCG reference implementation of the TPM 2.0 Specification."
> +HOMEPAGE = "https://github.com/microsoft/ms-tpm-20-ref/"
> +
> +COMPATIBLE_MACHINE ?= "invalid"
> +COMPATIBLE_MACHINE:genericarm64 = "genericarm64"
> +COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64"
> +COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64"
> +COMPATIBLE_MACHINE:qemuarm-secureboot = "qemuarm"
> +
> +inherit deploy python3native
> +
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=5a3925ece0806073ae9ebbb08ff6f11e"
> +LIC_FILES_CHKSUM += "file://optee-ta/LICENSE;md5=5a3925ece0806073ae9ebbb08ff6f11e"
> +
> +DEPENDS = "python3-pyelftools-native optee-os-tadevkit python3-cryptography-native"
> +DEPENDS:append:toolchain-clang = " lld-native"
> +
> +FTPM_UUID = "bc50d971-d4c9-42c4-82cb-343fb7f37896"
> +
> +SRC_URI_ms-tpm   ?= "gitsm://github.com/Microsoft/ms-tpm-20-ref;protocol=https"
> +SRC_URI_optee-ta ?= "gitsm://github.com/OP-TEE/optee_ftpm.git;protocol=https"
> +
> +SRCBRANCH_ms-tpm    = "main"
> +SRCBRANCH_optee-ta  = "master"
> +

Maybe we should use a ;tag= for optee-ta since we have tags and use them?

[...]

> diff --git a/meta-arm/recipes-security/optee/optee-test.inc b/meta-arm/recipes-security/optee/optee-test.inc
> index 397515f9..922911ad 100644
> --- a/meta-arm/recipes-security/optee/optee-test.inc
> +++ b/meta-arm/recipes-security/optee/optee-test.inc
> @@ -11,7 +11,9 @@ require optee.inc
>   DEPENDS = "optee-client optee-os-tadevkit python3-cryptography-native openssl"
>   DEPENDS:append:toolchain-clang = " lld-native"
>   
> -SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
> +OPTEE_TEST_GIT_TAG = ";tag=${PV}"
> +

We could have this in optee.inc I believe? It applies to all recipes for 
which we have a tag and want to use that tag.

Also not entirely sure it makes sense to pass both branch=master and 
tag=${PV} (but the former is most welcome when the latter isn't 
specified, so maybe something like

in .inc files:
SRC_URI_BRANCH_OR_TAG ?= "tag=${PV}"

in _git.bb files:
SRC_URI_BRANCH_OR_TAG = "branch=master"

SRC_URI = 
"git://github.com/OP-TEE/optee_test.git;protocol=https;${SRC_URI_BRANCH_OR_TAG}"

for example (not tested!). Or maybe even

SRC_URI_BRANCH_OR_TAG ?= "${@'tag=${PV}' if d.getVar('PV') != 'git' else 
branch='master'}"

such that if the recipe filename ends with _git it automatically is 
branch=master, otherwise it is the version number taken as a tag (again, 
not tested).

This can be a separate patch. No blocker for merging this in my opinion.

Cheers,
Quentin