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 | 29f245246185ca2933269890ec7561d5c76e0771 (patch) | |
| tree | daa65c96fbd589ba05279f449e989b7ad22439f8 /target/linux/x86/image | |
| parent | a96196039fdd13706de9bc269038e63c3bf2e48d (diff) | |
| download | upstream-29f245246185ca2933269890ec7561d5c76e0771.tar.gz upstream-29f245246185ca2933269890ec7561d5c76e0771.tar.bz2 upstream-29f245246185ca2933269890ec7561d5c76e0771.zip | |
x86: explicitely pass staging directory to grub-mkimage instead of relying on build time defaults (#12821)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35200 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 \ |