X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fx86%2Fimage%2FMakefile;h=62d4c7305573b71e7baa5fec0ef93e9381fe36d5;hb=df922b9b14cc1d14a8e8ae1998613d21635a137d;hp=a5f772251846661a6131eae93524ff7faf01cd36;hpb=81d8280c93eda889c7679b43f7c69fa6f2138b11;p=openwrt.git

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index a5f7722518..62d4c73055 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -18,7 +18,7 @@ GRUB_CONSOLE_CMDLINE =
 
 USE_ATKBD = generic kvm_guest
 
-ifneq ($(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget))),)
+ifneq ($(strip $(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget)))),)
   GRUB2_MODULES += at_keyboard
   GRUB2_MODULES_ISO += at_keyboard
 endif
@@ -67,6 +67,7 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
 	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
 	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
 	grub-mkimage \
+		-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
 		-o $(KDIR)/grub2/core.img \
 		-O i386-pc \
 		-c ./grub-early.cfg \
@@ -135,6 +136,7 @@ define Image/Build/iso
 	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
 	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
 	grub-mkimage \
+		-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
 		-o $(KDIR)/grub2/eltorito.img \
 		-O i386-pc \
 		-c ./grub-early.cfg \