Verified Commit 3a7636eb authored by Max Rees's avatar Max Rees
Browse files

pmmx: fix EFI image generation when building on x86_64 host

When generating a pmmx spin on an x86_64 host, the host's grub-mkimage
is used, which looks in the host's /usr/lib/grub for i386-efi by default
when generating the EFI image. Since this doesn't exist on any of our
x86_64 hosts, use the /usr/lib/grub from the squashfs we just generated
instead. grub-mkimage supports this usage using the -d/--directory
option.

This probably would have been noticed earlier since it generates the
following fatal error:

grub-mkimage: error: cannot open `/usr/lib/grub/i386-efi/moddep.lst': No such file or directory.

But the post scripts are run using "sh" instead of "sh -e", ".", etc
from the main script.
parent 8dabe837
......@@ -8,7 +8,7 @@ else
grub-mkimage -c x86/early.cfg -v -p boot -o grubcore-stage1.img -O i386-pc biosdisk boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs linux ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs reboot gfxterm gfxterm_background gfxterm_menu
cat /usr/lib/grub/i386-pc/cdboot.img grubcore-stage1.img > cdroot-pmmx/boot/grubcore.img
grub-mkimage -c x86/early.cfg -v -p boot -o x86/efi32.exe -O i386-efi boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu
grub-mkimage -d squashroot-pmmx/usr/lib/grub/i386-efi -c x86/early.cfg -v -p boot -o x86/efi32.exe -O i386-efi boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu
fi
cp x86/grub.cfg cdroot-pmmx/boot/grub.cfg
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment