From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 17 Jan 2013 15:46:26 +0000 (+0000)
Subject: x86: explicitely pass staging directory to grub-mkimage instead of relying on build... 
X-Git-Tag: reboot~11565
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7399df1d698c1873ece51b23de8ee67702e4046d;p=openwrt%2Fopenwrt.git

x86: explicitely pass staging directory to grub-mkimage instead of relying on build time defaults (#12821)

SVN-Revision: 35200
---

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index e31734870f..62d4c73055 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -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 \