| Message ID | 1438170732.2675.12.camel@intel.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Kinsella, Ray, On Wed, 29 Jul 2015 11:52:14 +0000, Kinsella, Ray wrote: > 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 > > Signed-off-by: Ray Kinsella <ray.kinsella@intel.com> The title of the patch should have been: grub2: build El Torito image only for i386 PC We want all commit titles to be prefixed by the name of the package the commit is touching. > +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 > +GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALL_ELTORITO > +endif > + > define GRUB2_IMAGE_INSTALLATION > mkdir -p $(dir $(GRUB2_IMAGE)) > $(HOST_DIR)/usr/bin/grub-mkimage \ > @@ -76,8 +84,6 @@ 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) > endef And I tested your patch, and it fails to build. So it seems like you did not test it properly. The reason is that the $(GRUB2_IMAGE) used by your new post-install hook is not generated until the next post-install hook (the existing GRUB2_IMAGE_INSTALLATION function) gets executed. But this hook is afterwards. So I changed the implementation to simply make the GRUB2_IMAGE_INSTALLATION function call GRUB2_IMAGE_INSTALL_ELTORITO. I applied your patch with those changes, see: http://git.buildroot.net/buildroot/commit/?id=8f609ed603220e0ac0ef9a45b0214eb87ab85d1e Thanks for this contribution! Thomas
Hi Thomas, > And I tested your patch, and it fails to build. So it seems like you > did not test it properly. humble apologies, I thought it was fine - clearly I made a mistake somewhere. > The reason is that the $(GRUB2_IMAGE) used by > your new post-install hook is not generated until the next post-install > hook (the existing GRUB2_IMAGE_INSTALLATION function) gets executed. But > this hook is afterwards. Moving ELTORITO to after GRUB2_IMAGE_INSTALLATION would have fixed it also then. I originally had my code exactly like this yours then didn't want to pollute GRUB2_IMAGE_INSTALLATION with the GRUB2_IMAGE_INSTALL_ELTORITO which may be empty. > > So I changed the implementation to simply make the > GRUB2_IMAGE_INSTALLATION function call GRUB2_IMAGE_INSTALL_ELTORITO. np, small change. Thanks, Ray K
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 280b4d6..7e0f31f 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -67,6 +67,14 @@ 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 +GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALL_ELTORITO +endif + define GRUB2_IMAGE_INSTALLATION mkdir -p $(dir $(GRUB2_IMAGE)) $(HOST_DIR)/usr/bin/grub-mkimage \ @@ -76,8 +84,6 @@ 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) endef
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 Signed-off-by: Ray Kinsella <ray.kinsella@intel.com> --- boot/grub2/grub2.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)