diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-01-17 15:46:26 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-01-17 15:46:26 +0000 |
| commit | 7399df1d698c1873ece51b23de8ee67702e4046d (patch) | |
| tree | db78d691ba0dc0a6840b41a0ff073530575fdb99 /target/linux/x86/image | |
| parent | 57f7408b8af32b6cd82da1b4d76853b52473a212 (diff) | |
| download | upstream-7399df1d698c1873ece51b23de8ee67702e4046d.tar.gz upstream-7399df1d698c1873ece51b23de8ee67702e4046d.tar.bz2 upstream-7399df1d698c1873ece51b23de8ee67702e4046d.zip | |
x86: explicitely pass staging directory to grub-mkimage instead of relying on build time defaults (#12821)
SVN-Revision: 35200
Diffstat (limited to 'target/linux/x86/image')
| -rw-r--r-- | target/linux/x86/image/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
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 \ |