diff mbox series

grub-efi.bbclass: fix racing issue on grub-efi image

Message ID 20250905065740.3721738-1-hongxu.jia@windriver.com
State New
Headers show
Series grub-efi.bbclass: fix racing issue on grub-efi image | expand

Commit Message

Hongxu Jia Sept. 5, 2025, 6:57 a.m. UTC
In recipe grub-efi, the deploy task installed grub-efi image to deploy dir.

In image-live.bbclass, the do_bootimg task called build_iso -> efi_iso_populate
-> efi_populate.

In image-live.bbclass, the do_bootimg task called build_hddimg -> efi_hddimg_populate
-> efi_populate.

In grub-efi.bbclass, efi_populate called efi_populate_common for grub-efi to
installed grub-efi image from deploy dir to ISO/HDDDIR.

Explicitly make do_bootimg depend on grub-efi:deploy otherwise a racing issue
on grub-efi image in deploy dir
...
|DEBUG: Executing shell function build_iso
|NOTE: Trying to install tmp/deploy/images/qemux86-64/bzImage as tmp/work/qemux86_64-wrs-linux/
wrlinux-image-installer/1.0/sources/wrlinux-image-installer-1.0/iso/bzImage
|install: cannot stat 'tmp/deploy/images/qemux86-64/grub-efi-bootx64.efi': No such file or directory
|WARNING: tmp/work/qemux86_64-wrs-linux/wrlinux-image-installer/1.0/temp/run.build_iso.954273:419 exit 1 from
'install -m 0644 tmp/deploy/images/qemux86-64/$2-bootx64.efi ${DEST}/EFI/BOOT/bootx64.efi'
...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/classes-recipe/grub-efi.bbclass | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/meta/classes-recipe/grub-efi.bbclass b/meta/classes-recipe/grub-efi.bbclass
index 4afd12195fb..34bcbc53e69 100644
--- a/meta/classes-recipe/grub-efi.bbclass
+++ b/meta/classes-recipe/grub-efi.bbclass
@@ -7,6 +7,9 @@ 
 inherit grub-efi-cfg
 require conf/image-uefi.conf
 
+# Assure the existence of grub-efi image in deploy dir
+do_bootimg[depends] += "grub-efi:do_deploy"
+
 efi_populate() {
 	efi_populate_common "$1" grub-efi