* [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix
@ 2022-01-24 16:29 Ross Burton
2022-01-24 16:29 ` [PATCH 2/4] arm-bsp/trusted-firmware-m: use SRCPV in the corstone1000 overrides Ross Burton
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ross Burton @ 2022-01-24 16:29 UTC (permalink / raw)
To: meta-arm
It's not recommended to use ${S} in SRC_URI as S contains references
to the version which results in a circular list of variable lookups.
destsuffix is relative to WORKDIR and defaults to git/, so use relative
paths with the same result.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../trusted-firmware-m/trusted-firmware-m_1.5.0.bb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb
index fe3f729c..302fd2cd 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb
@@ -15,11 +15,11 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \
file://../mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://../mcuboot/LICENSE;md5=b6ee33f1d12a5e6ee3de1e82fb51eeb8"
-SRC_URI = "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https;branch=${SRCBRANCH_tfm};name=tfm;destsuffix=${S} \
- git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;branch=release/1.5.x;name=tfm-tests;destsuffix=${S}/../tf-m-tests \
- git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=master;name=mbedtls;destsuffix=${S}/../mbedtls \
- git://github.com/mcu-tools/mcuboot.git;protocol=https;branch=main;name=mcuboot;destsuffix=${S}/../mcuboot \
- file://cbor2.patch;patchdir=${S}/../mcuboot \
+SRC_URI = "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https;branch=${SRCBRANCH_tfm};name=tfm;destsuffix=git/tfm \
+ git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;branch=release/1.5.x;name=tfm-tests;destsuffix=git/tf-m-tests \
+ git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=master;name=mbedtls;destsuffix=git/mbedtls \
+ git://github.com/mcu-tools/mcuboot.git;protocol=https;branch=main;name=mcuboot;destsuffix=git/mcuboot \
+ file://cbor2.patch;patchdir=../mcuboot \
"
# The required dependencies are documented in tf-m/config/config_default.cmake
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] arm-bsp/trusted-firmware-m: use SRCPV in the corstone1000 overrides
2022-01-24 16:29 [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Ross Burton
@ 2022-01-24 16:29 ` Ross Burton
2022-01-24 16:29 ` [PATCH 3/4] arm-bsp/optee-os: " Ross Burton
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2022-01-24 16:29 UTC (permalink / raw)
To: meta-arm
corstone1000 currently has a git snapshot of TF-M, so that the version
number is managable use SRCPV instead of SRCREV.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
index c0bce148..0e25fbe7 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
@@ -13,8 +13,8 @@ SRCREV_tfm = "49a28600f9dd640638f667273ef15acb6d1a8e1c"
SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49"
SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8"
-PV = "1.5.0+git${SRCREV_tfm}"
-SRCREV_FORMAT = "tfm_mcuboot_tfm-tests_mbedtls"
+PV = "1.5.0+git${SRCPV}"
+SRCREV_FORMAT = "tfm"
# The install task signs the TF-A BL2 and FIP binaries.
# So they need to be copied to the sysroot. Hence the dependencies below:
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] arm-bsp/optee-os: use SRCPV in the corstone1000 overrides
2022-01-24 16:29 [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Ross Burton
2022-01-24 16:29 ` [PATCH 2/4] arm-bsp/trusted-firmware-m: use SRCPV in the corstone1000 overrides Ross Burton
@ 2022-01-24 16:29 ` Ross Burton
2022-01-24 16:29 ` [PATCH 4/4] arm/psa-arch-tests: set PV correctly Ross Burton
2022-01-24 19:53 ` [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2022-01-24 16:29 UTC (permalink / raw)
To: meta-arm
corstone1000 currently has a git snapshot of optee-os, so that the
version number is managable use SRCPV instead of SRCREV.
Also fix whitespace in SRC_URI.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../recipes-security/optee/optee-os_corstone1000_common.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc
index 6e81316b..e17467fe 100644
--- a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc
+++ b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc
@@ -1,6 +1,6 @@
SRC_URI = "git://git.trustedfirmware.org/OP-TEE/optee_os.git;protocol=https;branch=psa-development"
SRCREV = "f9de2c9520ed97b89760cc4c99424aae440b63f4"
-PV .= "+git${SRCREV}"
+PV .= "+git${SRCPV}"
DEPENDS += "python3-pycryptodomex-native dtc-native"
@@ -10,7 +10,7 @@ SRC_URI:append = " \
file://0001-plat-corstone1000-add-corstone1000-platform.patch \
file://0002-plat-corstone1000-reserve-3MB-CVM-memory-for-optee.patch \
file://0003-plat-corstone1000-add-a-rule-in-Makefile-to-SP_MAKEF.patch \
- file://0004-plat-corstone1000-increase-OPTEE-core-heap-size.patch \
+ file://0004-plat-corstone1000-increase-OPTEE-core-heap-size.patch \
file://0005-Fix-add-missing-error-check-during-SP-init.patch \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] arm/psa-arch-tests: set PV correctly
2022-01-24 16:29 [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Ross Burton
2022-01-24 16:29 ` [PATCH 2/4] arm-bsp/trusted-firmware-m: use SRCPV in the corstone1000 overrides Ross Burton
2022-01-24 16:29 ` [PATCH 3/4] arm-bsp/optee-os: " Ross Burton
@ 2022-01-24 16:29 ` Ross Burton
2022-01-24 19:53 ` [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2022-01-24 16:29 UTC (permalink / raw)
To: meta-arm
Don't use SRCREV in the PV, but use SRCPV as this truncates the SHA.
Also bump to 1.2+git, as the psa-arch-tests project does tag releases.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../recipes-security/trusted-services/psa-arch-tests_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb b/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb
index ff38f7d0..0e7213a1 100644
--- a/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb
+++ b/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb
@@ -8,7 +8,7 @@ SRC_URI:append = " ${SRC_URI_PSA}"
SRCREV_FORMAT="ts_psa"
SRCREV_psa = "6e1549dde62d12c92fc2df90ebbbe2d2d77cc76a"
-PV = "0.0+git${SRCREV_psa}"
+PV = "1.2+git${SRCPV}"
PSA_APPLICATION_NAME = "psa-api-test"
TS_ENVIRONMENT_LINUX = "arm-linux"
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix
2022-01-24 16:29 [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Ross Burton
` (2 preceding siblings ...)
2022-01-24 16:29 ` [PATCH 4/4] arm/psa-arch-tests: set PV correctly Ross Burton
@ 2022-01-24 19:53 ` Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2022-01-24 19:53 UTC (permalink / raw)
To: meta-arm, Ross Burton
On Mon, 24 Jan 2022 16:29:44 +0000, Ross Burton wrote:
> It's not recommended to use ${S} in SRC_URI as S contains references
> to the version which results in a circular list of variable lookups.
>
> destsuffix is relative to WORKDIR and defaults to git/, so use relative
> paths with the same result.
Applied, thanks!
[1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix
commit: 841179266847669f71cb2ea66d55bd62ec28249b
[2/4] arm-bsp/trusted-firmware-m: use SRCPV in the corstone1000 overrides
commit: 82d91ee3ac1dce0a314414e5ead8cb898caf0236
[3/4] arm-bsp/optee-os: use SRCPV in the corstone1000 overrides
commit: 1fbdea98ce2738dda827af070e0156b907f97422
[4/4] arm/psa-arch-tests: set PV correctly
commit: ed737688f26131a63d67622ed4f8cc21055d7dfc
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-24 19:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-24 16:29 [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Ross Burton
2022-01-24 16:29 ` [PATCH 2/4] arm-bsp/trusted-firmware-m: use SRCPV in the corstone1000 overrides Ross Burton
2022-01-24 16:29 ` [PATCH 3/4] arm-bsp/optee-os: " Ross Burton
2022-01-24 16:29 ` [PATCH 4/4] arm/psa-arch-tests: set PV correctly Ross Burton
2022-01-24 19:53 ` [PATCH 1/4] arm/trusted-firmware-m: use relative paths for SRC_URI destsuffix Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.