grub-efi: Rename and update grub-efi for recent oe-core changes

OE-Core has changed the grub-efi implementation, splitting out
grub-efi-native and moving the do_mkimage task to do_deploy. Rename and
update this bbappend accordingly.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Tom Zanussi <tom.zanussi@linux.intel.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend b/meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend
index c6904ef0..f6105711 100644
--- a/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend
+++ b/meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend
@@ -2,10 +2,12 @@
 # before launching the grub.efi payload. Ensure GRUB has keyboard control by
 # building in the usb, usb_keyboard, and ohci modules.
 
-do_mkimage() {
-        ./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \
+do_deploy() {
+        # Search for the grub.cfg on the local boot media by using the
+        # built in cfg file provided via this recipe
+        grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \
                        -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
-                       boot linux ext2 fat serial part_msdos part_gpt normal efi_gop \
+                       boot linux ext2 fat serial part_msdos part_gpt normal efi_gop iso9660 search \
                        usb usb_keyboard ohci
+        install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR}
 }
-