From a4baf911ab9d306ce5200e7d794ed6a9ccb25f30 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Tue, 17 Sep 2013 13:32:14 +0000 Subject: bootimage.bbclass, grub-efi.bbclass: Improve EFI & PCBIOS+EFI ISO support Using the latest mkisofs it is possible to generate 3 different types of ISO images, which can be used in various scenarios. 1) PCBIOS Only ISO - This option remains unchanged by this commit - Uses syslinux menus - Can be directly copied with dd to a USB device - Can be burned to optical media 2) EFI Only ISO - Uses grub 2 menus - Can be burned to optical media - If you want to use this image on a USB device extra steps must be taken in order to format the USB device with fat32, and copy an EFI loader which will in turn load the iso image 3) PCBIOS / EFI ISO - This is a hybrid image ISO that will work for case 1 or 2 as above with the same restrictions and boot menu types depending on what type of firmware is installed on the hardware or depending on if EFI or "Legacy Boot" is enabled on some UEFI firmwares. The syslinux.bbclass is now always required because that is where the isohybrid dependencies come from as well as the configuration data for the isohybrid. The isohybrid is the secret sauce which allows the ISO to work as optical media or as a disk image on USB or a HDD/SSD. [YOCTO #4100] Signed-off-by: Jason Wessel Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/grub-efi.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'meta/classes/grub-efi.bbclass') diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index c6f5d4e246..c21babb293 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -41,6 +41,14 @@ grubefi_populate() { grubefi_iso_populate() { grubefi_populate ${ISODIR} + # Build a EFI directory to create efi.img + mkdir -p ${EFIIMGDIR}/${EFIDIR} + cp ${ISODIR}/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} + cp ${ISODIR}/vmlinuz ${EFIIMGDIR} + echo "EFI\\BOOT\\${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh + if [ -f "${ISODIR}/initrd" ] ; then + cp ${ISODIR}/initrd ${EFIIMGDIR} + fi } grubefi_hddimg_populate() { -- cgit 1.2.3-korg