Commit 8f609ed6 authored by Kinsella, Ray's avatar Kinsella, Ray Committed by Thomas Petazzoni
Browse files

grub2: build El Torito image only for i386 PC platform 



Building Grub2 El Torito for i386 EFI errors complaining it cannot
find cdboot.img

        cdboot.img: No such file or directory

This commit builds El Torito for i386 PC only.

[Thomas: fix installation ordering.]

Signed-off-by: default avatarRay Kinsella <ray.kinsella@intel.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b38205c7

boot/grub2/grub2.mk

+8 −2
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ GRUB2_CONF_OPTS = \ 


GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install



ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)

define GRUB2_IMAGE_INSTALL_ELTORITO

	cat $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/cdboot.img $(GRUB2_IMAGE) > \

		$(BINARIES_DIR)/grub-eltorito.img

endef

endif



define GRUB2_IMAGE_INSTALLATION

	mkdir -p $(dir $(GRUB2_IMAGE))

	$(HOST_DIR)/usr/bin/grub-mkimage \
@@ -76,10 +83,9 @@ define GRUB2_IMAGE_INSTALLATION 
		-p "$(GRUB2_PREFIX)" \

		$(if $(GRUB2_BUILTIN_CONFIG),-c $(GRUB2_BUILTIN_CONFIG)) \

		$(GRUB2_BUILTIN_MODULES)

	cat $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/cdboot.img $(GRUB2_IMAGE) > \

		$(BINARIES_DIR)/grub-eltorito.img

	mkdir -p $(dir $(GRUB2_CFG))

	$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)

	$(GRUB2_IMAGE_INSTALL_ELTORITO)

endef

GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALLATION