From patchwork Tue Jan 11 00:07:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ryan Fairfax X-Patchwork-Id: 2236 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4BC0C433EF for ; Tue, 11 Jan 2022 00:07:20 +0000 (UTC) Subject: [PATCH] arm/optee-os: Fix build race condition when using fTPM To: meta-arm@lists.yoctoproject.org From: "Ryan Fairfax" X-Originating-Location: Redmond, Washington, US (71.227.177.100) X-Originating-Platform: Windows Chrome 97 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Mon, 10 Jan 2022 16:07:19 -0800 Message-ID: List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 11 Jan 2022 00:07:20 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2811 Update dependencies to depend on optee-ftpm:do_deploy instead of do_populate_sysroot since binaries are being referenced from DEPLOY_DIR_IMAGE. Signed-off-by: Ryan Fairfax --- .../recipes-security/optee-ftpm/optee-os_%.bbappend  | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.25.1 diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend index 0cfa949..6e2edce 100644 --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend @@ -1,11 +1,11 @@ FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896" -DEPENDS:append = "\ -                  ${@bb.utils.contains('MACHINE_FEATURES', \ -                 'optee-ftpm', \ -                 'optee-ftpm', \ -                 '' , \ -                 d)}" +do_compile[depends] += "\ +                       ${@bb.utils.contains('MACHINE_FEATURES', \ +                      'optee-ftpm', \ +                      'optee-ftpm:do_deploy', \ +                      '' , \ +                      d)}" EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \ 'optee-ftpm', \