From d958630a7150c1d7ae8e7b11b5d73fdd86408611 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 6 Jul 2023 19:44:07 +0000 Subject: [PATCH] conf/k3: switch mcdepends from do_image_complete Previously k3 mcdepends for k3r5 artifacts has been changed from do_image_wic to support non-wic builds in other layers and do_image_complete was believed to be sufficient. Switching k3r5 to baremetal builds has exposed another race when some pieces come from sstate and hence requires using do_image instead. Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/include/k3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 8f6f4014..a8e80fa7 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -60,7 +60,7 @@ MACHINE_FEATURES += "efi" WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" do_image_wic[depends] += "virtual/bootloader:do_deploy" -do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" +do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"