[v2] optee-ftpm: Update to "main" branch

Message ID 20220623120814.214530-1-leo.yan@linaro.org
State New
Headers show
Series [v2] optee-ftpm: Update to "main" branch | expand

Commit Message

Leo Yan June 23, 2022, 12:08 p.m. UTC
Since the github repository doesn't contain a "master" branch but has the
"main" branch now, this patch updates to the "main" branch so can
download the repository successfully.

CC: Ilias Apalodimas <ilias.apalodimas@linaro.org>
CC: Jerome Forissier <jerome.forissier@linaro.org>
CC: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
v2: Fixed typo in the commit log.

 meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jon Mason June 23, 2022, 5:15 p.m. UTC | #1
On Thu, 23 Jun 2022 20:08:14 +0800, Leo Yan wrote:
> Since the github repository doesn't contain a "master" branch but has the
> "main" branch now, this patch updates to the "main" branch so can
> download the repository successfully.

Applied, thanks!

[1/1] optee-ftpm: Update to "main" branch
      commit: 6ef5382ffee3de7f65510d04290dc8e8f69701d4

Best regards,
Sumit Garg Aug. 22, 2022, 12:25 p.m. UTC | #2
Hi Jon,

On Thu, 23 Jun 2022 at 22:45, Jon Mason <jdmason@kudzu.us> wrote:
>
> On Thu, 23 Jun 2022 20:08:14 +0800, Leo Yan wrote:
> > Since the github repository doesn't contain a "master" branch but has the
> > "main" branch now, this patch updates to the "main" branch so can
> > download the repository successfully.
>
> Applied, thanks!
>
> [1/1] optee-ftpm: Update to "main" branch
>       commit: 6ef5382ffee3de7f65510d04290dc8e8f69701d4
>

Can you backport this fix to stable releases (at least kirkstone which
I know is broken) as well?

-Sumit

> Best regards,
> --
> Jon Mason <jon.mason@arm.com>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#3537): https://lists.yoctoproject.org/g/meta-arm/message/3537
> Mute This Topic: https://lists.yoctoproject.org/mt/91941411/1777089
> Group Owner: meta-arm+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [sumit.garg@linaro.org]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
index d282c25..3b4eb5c 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
@@ -19,7 +19,7 @@  DEPENDS = "python3-pyelftools-native optee-os-tadevkit python3-cryptography-nati
 
 FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"
 
-SRC_URI = "gitsm://github.com/Microsoft/ms-tpm-20-ref;branch=master;protocol=https \
+SRC_URI = "gitsm://github.com/Microsoft/ms-tpm-20-ref;branch=main;protocol=https \
            file://0001-add-enum-to-ta-flags.patch"
 
 SRCREV = "d638536d0fe01acd5e39ffa1bd100b3da82d92c7"