KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 35200
This commit is contained in:
Jo-Philipp Wich 2013-01-17 15:46:26 +00:00
parent 57f7408b8a
commit 7399df1d69
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/x86/image/Makefile
View file

@ -67,6 +67,7 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
grub-mkimage \ grub-mkimage \
-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
-o $(KDIR)/grub2/core.img \ -o $(KDIR)/grub2/core.img \
-O i386-pc \ -O i386-pc \
-c ./grub-early.cfg \ -c ./grub-early.cfg \
@ -135,6 +136,7 @@ define Image/Build/iso
$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
grub-mkimage \ grub-mkimage \
-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
-o $(KDIR)/grub2/eltorito.img \ -o $(KDIR)/grub2/eltorito.img \
-O i386-pc \ -O i386-pc \
-c ./grub-early.cfg \ -c ./grub-early.cfg \