On Mon, 2013-12-16 at 10:23 -0800, Darren Hart wrote: > 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 <[email protected]>
Acked-by: Tom Zanussi <[email protected]> > --- > meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend | 11 ----------- > meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend | 13 +++++++++++++ > 2 files changed, 13 insertions(+), 11 deletions(-) > delete mode 100644 meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend > create mode 100644 meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend > > diff --git a/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend > b/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend > deleted file mode 100644 > index c6904ef..0000000 > --- a/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend > +++ /dev/null > @@ -1,11 +0,0 @@ > -# The Intel provided Fast Boot Firmware may not initialize the USB keyboard > -# 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/ \ > - -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ > - boot linux ext2 fat serial part_msdos part_gpt normal > efi_gop \ > - usb usb_keyboard ohci > -} > - > diff --git a/meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend > b/meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend > new file mode 100644 > index 0000000..f610571 > --- /dev/null > +++ b/meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend > @@ -0,0 +1,13 @@ > +# The Intel provided Fast Boot Firmware may not initialize the USB keyboard > +# before launching the grub.efi payload. Ensure GRUB has keyboard control by > +# building in the usb, usb_keyboard, and ohci modules. > + > +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 iso9660 search \ > + usb usb_keyboard ohci > + install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR} > +} _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
