From patchwork Tue Feb 6 16:52:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emekcan Aras X-Patchwork-Id: 38945 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 3B881C4828D for ; Tue, 6 Feb 2024 16:53:18 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.26369.1707238396270729443 for ; Tue, 06 Feb 2024 08:53:16 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: emekcan.aras@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 499B31FB; Tue, 6 Feb 2024 08:53:58 -0800 (PST) Received: from e126835.cambridge.arm.com (e126835.cambridge.arm.com [10.1.34.129]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AD3C53F64C; Tue, 6 Feb 2024 08:53:14 -0800 (PST) From: emekcan.aras@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Ali Can Ozaslan , Emekcan Aras Subject: [PATCH 1/1] arm-bsp/u-boot:corstone1000: Fix deployment of capsule files Date: Tue, 6 Feb 2024 16:52:54 +0000 Message-Id: <20240206165254.109536-2-emekcan.aras@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240206165254.109536-1-emekcan.aras@arm.com> References: <20240206165254.109536-1-emekcan.aras@arm.com> MIME-Version: 1.0 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, 06 Feb 2024 16:53:18 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5373 From: Ali Can Ozaslan The capsule_cert and capsule_key file generated by u-boot for corstone1000 do not get deployed correctly since writingh the output directly to ${DEPLOY_DIR_IMAGE} causes the sstate mechanism to malfunction especially in the CI builds. This patch fixes the issue and deploy the generated files correctly. Signed-off-by: Ali Can Ozaslan Signed-off-by: Emekcan Aras --- .../recipes-bsp/u-boot/u-boot-corstone1000.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc index b6b7a04f..cf0640a3 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc @@ -57,7 +57,14 @@ do_configure:append(){ cert-to-efi-sig-list ${B}/CRT.crt ${B}/corstone1000_defconfig/CRT.esl } +FILES:${PN} += "/corstone1000_capsule_*" do_install:append() { - install -D -p -m 0644 ${B}/CRT.crt ${DEPLOY_DIR_IMAGE}/corstone1000_capsule_cert.crt - install -D -p -m 0644 ${B}/CRT.key ${DEPLOY_DIR_IMAGE}/corstone1000_capsule_key.key + install -D -p -m 0644 ${B}/CRT.crt ${D}/corstone1000_capsule_cert.crt + install -D -p -m 0644 ${B}/CRT.key ${D}/corstone1000_capsule_key.key } + +do_deploy:append(){ + cp -Rf ${D}/corstone1000_capsule* ${DEPLOYDIR}/ +} + +addtask deploy after do_install