Re: [PATCH v2] arm/optee-os: Fix build race condition when building fTPM

Re: [PATCH v2] arm/optee-os: Fix build race condition when building fTPM

[Ryan Fairfax]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

I posted from this list's web client to try to avoid encoding issues - in part because I cannot use easily alternative clients with my mail account.  I'll see what I can do to get this resent but are there any specific errors that might help me understand what is getting modified?

[-- Attachment #2: Type: text/html, Size: 288 bytes --]

Re: [meta-arm] [PATCH v2] arm/optee-os: Fix build race condition when building fTPM

[Denys Dmytriyenko]

The patch is corrupted even visually - it lost all indentation and leading 
whitespaces...


On Tue, Jan 11, 2022 at 03:32:13PM -0500, Jon Mason wrote:
> On Tue, Jan 11, 2022 at 11:38:26AM -0800, Ryan Fairfax wrote:
> > I posted from this list's web client to try to avoid encoding issues - in part because I cannot use easily alternative clients with my mail account.  I'll see what I can do to get this resent but are there any specific errors that might help me understand what is getting modified?
> 
> Using b4 is the easiest way to see
> 
> $ b4 am -o - jKa2.1641920328439478855.fAON@lists.yoctoproject.org | git am -s
> Looking up https://lore.kernel.org/r/jKa2.1641920328439478855.fAON%40lists.yoctoproject.org
> Grabbing thread from lore.kernel.org/all
> Analyzing 1 messages in the thread
> ---
> Writing /tmp/tmpjx37s82ib4-am-stdout
>   [PATCH v2] arm/optee-os: Fix build race condition when building fTPM
> ---
> Total patches: 1
> ---
>  Link: https://lore.kernel.org/r/jKa2.1641920328439478855.fAON@lists.yoctoproject.org
>  Base: not found (applies clean to current tree)
> ---
> Applying: arm/optee-os: Fix build race condition when building fTPM
> error: corrupt patch at line 11
> Patch failed at 0001 arm/optee-os: Fix build race condition when building fTPM
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
> 
> 
> One way around using an Outlook server is to use Gmail as the SMTP
> server and have it rewrite the address when it sends.  See 
> https://support.google.com/mail/answer/22370?hl=en
> 
> I might have used this in the past :)

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [PATCH v2] arm/optee-os: Fix build race condition when building fTPM

[Ryan Fairfax]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

Thanks - I've got a solution I think will work with git send-email based on some feedback from co-workers.  I'll get that tested and then resend the patch when I see everything working on my end.  Apologies for the noise.

[-- Attachment #2: Type: text/html, Size: 233 bytes --]

[PATCH v2] arm/optee-os: Fix build race condition when building fTPM

[Ryan Fairfax]

[-- Attachment #1: Type: text/plain, Size: 2451 bytes --]

[PATCH v2] arm/optee-os: Fix build race condition when building fTPM

Change optee-ftpm to install embeddable (stripped) version to target sysroot.  When building optee-os pick up from sysroot instead of DEPLOY_DIR_IMAGE.  This fixes a build race condition where DEPENDS was only adding a dependency for optee-ftpm:do_populate_sysroot instead of do_deploy and makes the usage of dependencies a bit more standard by using sysroots instead of deploy output.

Signed-off-by: Ryan Fairfax <rfairfax@microsoft.com>
---
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb   | 6 +++++-
meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)

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 e30e13a..f2a74da 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
@@ -60,6 +60,7 @@ do_compile() {
do_install () {
mkdir -p ${D}/lib/optee_armtz
install -D -p -m 0644 ${S}/TAs/optee_ta/out/fTPM/${FTPM_UUID}.ta ${D}/lib/optee_armtz/
+    install -D -p -m 0644 ${S}/TAs/optee_ta/out/fTPM/${FTPM_UUID}.stripped.elf ${D}/lib/optee_armtz/
}

do_deploy () {
@@ -69,7 +70,10 @@ do_deploy () {

addtask deploy before do_build after do_install

-FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.ta"
+FILES:${PN} += " \
+               ${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.ta \
+               ${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf \
+               "

# Imports machine specific configs from staging to build
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
index 0cfa949..acea750 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
+++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
@@ -9,6 +9,6 @@ DEPENDS:append = "\

EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \
'optee-ftpm', \
-                      'CFG_EARLY_TA=y EARLY_TA_PATHS="${DEPLOY_DIR_IMAGE}/optee/${FTPM_UUID}.stripped.elf"', \
+                      'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', \
'', \
d)} "
--
2.25.1

[-- Attachment #2: Type: text/html, Size: 3615 bytes --]