From 145bb348653004e9a4d74afedb7675c2f7be973e Mon Sep 17 00:00:00 2001 From: Ali Can Ozaslan Date: Tue, 6 Feb 2024 16:52:54 +0000 Subject: [PATCH] arm-bsp/u-boot:corstone1000: Fix deployment of capsule files 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