From 1fc095ec75434286458ced384a63acd07c82c447 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Fri, 22 Oct 2021 13:51:33 +0200 Subject: [PATCH] boot/grub2: fix the cdboot.img source from host to target This patch updates the location of cdboot.img used, to select the one from the target directory and not from the host. The host-grub2 is built only to have access to the Grub tools binaries. Signed-off-by: Kory Maincent Cc: Yann E. MORIN Signed-off-by: Yann E. MORIN --- boot/grub2/grub2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 19047d02f7..270f289cfd 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -192,7 +192,7 @@ define GRUB2_INSTALL_IMAGES_CMDS $(GRUB2_BUILTIN_MODULES_$(tuple)) $(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG_$(tuple)) $(if $(findstring $(GRUB2_PLATFORM_$(tuple)), pc), \ - cat $(HOST_DIR)/lib/grub/$(tuple)/cdboot.img $(GRUB2_IMAGE_$(tuple)) > \ + cat $(@D)/build-$(tuple)/grub-core/cdboot.img $(GRUB2_IMAGE_$(tuple)) > \ $(BINARIES_DIR)/grub-eltorito.img ) \ )