* [PATCH langdale 0/1] arm/trusted-firmware-m: Do not use release branches
@ 2023-02-09 12:04 emekcan.aras
2023-02-09 12:04 ` [PATCH langdale 1/1] " emekcan.aras
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: emekcan.aras @ 2023-02-09 12:04 UTC (permalink / raw)
To: meta-arm, Ross.Burton, Jon.Mason; +Cc: nd, Emekcan Aras
From: Emekcan Aras <emekcan.aras@arm.com>
TFM repos do not use release branches. TFM-test repo does not use master
branch and use detached head for the 1.6 release. This commits makes necessary
changes to be able to build tfm and tfm-test again for langdale.
Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
Emekcan Aras (1):
arm/trusted-firmware-m: Do not use release branches
.../trusted-firmware-m/trusted-firmware-m_1.6.0.bb | 5 ++---
.../trusted-firmware-m-scripts-native_1.6.0.bb | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH langdale 1/1] arm/trusted-firmware-m: Do not use release branches
2023-02-09 12:04 [PATCH langdale 0/1] arm/trusted-firmware-m: Do not use release branches emekcan.aras
@ 2023-02-09 12:04 ` emekcan.aras
2023-02-12 21:29 ` [PATCH langdale 0/1] " Jon Mason
2023-02-17 4:30 ` Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: emekcan.aras @ 2023-02-09 12:04 UTC (permalink / raw)
To: meta-arm, Ross.Burton, Jon.Mason; +Cc: nd, Emekcan Aras
From: Emekcan Aras <emekcan.aras@arm.com>
TFM repos do not use release branches. TFM-test repo does not use master
branch and use detached head for the 1.6 release. This commits makes necessary
changes to be able to build tfm and tfm-test again for langdale.
Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
---
.../trusted-firmware-m/trusted-firmware-m_1.6.0.bb | 5 ++---
.../trusted-firmware-m-scripts-native_1.6.0.bb | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.6.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.6.0.bb
index f0c8d579..6b06c8a9 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.6.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.6.0.bb
@@ -16,20 +16,19 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \
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=git/tfm \
- git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;branch=${SRCBRANCH_tfm-tests};name=tfm-tests;destsuffix=git/tf-m-tests \
+ git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;nobranch=1;name=tfm-tests;destsuffix=git/tf-m-tests \
git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=${SRCBRANCH_mbedtls};name=mbedtls;destsuffix=git/mbedtls \
git://github.com/mcu-tools/mcuboot.git;protocol=https;branch=${SRCBRANCH_mcuboot};name=mcuboot;destsuffix=git/mcuboot \
"
# The required dependencies are documented in tf-m/config/config_default.cmake
# TF-Mv1.6.0
-SRCBRANCH_tfm ?= "release/1.6.x"
+SRCBRANCH_tfm ?= "master"
SRCREV_tfm = "7387d88158701a3c51ad51c90a05326ee12847a8"
# mbedtls-3.1.0
SRCBRANCH_mbedtls ?= "master"
SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49"
# TF-Mv1.6.0
-SRCBRANCH_tfm-tests ?= "release/1.6.x"
SRCREV_tfm-tests = "723905d46019596f3f2df66d79b5d6bff6f3f213"
# v1.9.0
SRCBRANCH_mcuboot ?= "main"
diff --git a/meta-arm/recipes-devtools/trusted-firmware-m-scripts/trusted-firmware-m-scripts-native_1.6.0.bb b/meta-arm/recipes-devtools/trusted-firmware-m-scripts/trusted-firmware-m-scripts-native_1.6.0.bb
index 453d456a..06c03161 100644
--- a/meta-arm/recipes-devtools/trusted-firmware-m-scripts/trusted-firmware-m-scripts-native_1.6.0.bb
+++ b/meta-arm/recipes-devtools/trusted-firmware-m-scripts/trusted-firmware-m-scripts-native_1.6.0.bb
@@ -1,7 +1,7 @@
SRC_URI = "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https;branch=${SRCBRANCH}"
# Use the wrapper script from TF-Mv1.6.0
-SRCBRANCH ?= "release/1.6.x"
+SRCBRANCH ?= "master"
SRCREV = "7387d88158701a3c51ad51c90a05326ee12847a8"
LICENSE = "BSD-3-Clause"
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH langdale 0/1] arm/trusted-firmware-m: Do not use release branches
2023-02-09 12:04 [PATCH langdale 0/1] arm/trusted-firmware-m: Do not use release branches emekcan.aras
2023-02-09 12:04 ` [PATCH langdale 1/1] " emekcan.aras
@ 2023-02-12 21:29 ` Jon Mason
2023-02-17 4:30 ` Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: Jon Mason @ 2023-02-12 21:29 UTC (permalink / raw)
To: meta-arm, emekcan.aras, Ross.Burton, Jon.Mason; +Cc: nd
On Thu, 9 Feb 2023 12:04:55 +0000, emekcan.aras@arm.com wrote:
> TFM repos do not use release branches. TFM-test repo does not use master
> branch and use detached head for the 1.6 release. This commits makes necessary
> changes to be able to build tfm and tfm-test again for langdale.
>
> Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
>
> Emekcan Aras (1):
> arm/trusted-firmware-m: Do not use release branches
>
> [...]
Applied, thanks!
[1/1] arm/trusted-firmware-m: Do not use release branches
commit: 4ec5d8b306e84f929188e038b330c01d68dabd3b
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH langdale 0/1] arm/trusted-firmware-m: Do not use release branches
2023-02-09 12:04 [PATCH langdale 0/1] arm/trusted-firmware-m: Do not use release branches emekcan.aras
2023-02-09 12:04 ` [PATCH langdale 1/1] " emekcan.aras
2023-02-12 21:29 ` [PATCH langdale 0/1] " Jon Mason
@ 2023-02-17 4:30 ` Jon Mason
2 siblings, 0 replies; 4+ messages in thread
From: Jon Mason @ 2023-02-17 4:30 UTC (permalink / raw)
To: meta-arm, emekcan.aras, Ross.Burton, Jon.Mason; +Cc: nd
On Thu, 9 Feb 2023 12:04:55 +0000, emekcan.aras@arm.com wrote:
> TFM repos do not use release branches. TFM-test repo does not use master
> branch and use detached head for the 1.6 release. This commits makes necessary
> changes to be able to build tfm and tfm-test again for langdale.
>
> Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
>
> Emekcan Aras (1):
> arm/trusted-firmware-m: Do not use release branches
>
> [...]
Applied, thanks!
[1/1] arm/trusted-firmware-m: Do not use release branches
commit: 79b44a4d32bc19eda2b3dec5750a818959097cd6
Best regards,
--
Jon Mason <jon.mason@arm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-17 4:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-09 12:04 [PATCH langdale 0/1] arm/trusted-firmware-m: Do not use release branches emekcan.aras
2023-02-09 12:04 ` [PATCH langdale 1/1] " emekcan.aras
2023-02-12 21:29 ` [PATCH langdale 0/1] " Jon Mason
2023-02-17 4:30 ` Jon Mason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).