From: Jason Wessel Date: Wed, 30 Oct 2013 17:35:17 +0000 (-0500) Subject: grub-efi.bbclass: Fix startup.nsh to work on more EFI revs X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35563 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=754b52ea7a3cdf8e7e939a314525d16c4dfb52cb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git grub-efi.bbclass: Fix startup.nsh to work on more EFI revs Some revs of the EFI firmware + shell do not automatically setup the path in a such a way as to execute a binary without an absolute reference like "FS0:\EFI\BOOT\bootx64.efi". All the versions that I have tested work properly by simply calling the binary which is in the EFI\BOOT directory by name like "bootx64.efi". The error you see on the console looks like the following: startup.nsh> EFI\BOOT\bootx64.efi 'EFI\BOOT\bootx64.efi' is not recognized as an internal or external command, operable program, or batch file Shell> This patch simply drops the EFI\BOOT for greater compatibility. Signed-off-by: Jason Wessel Signed-off-by: Saul Wold --- diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 3765bfd8a2f..2f00901d049 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -49,7 +49,7 @@ grubefi_iso_populate() { mkdir -p ${EFIIMGDIR}/${EFIDIR} cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} cp $iso_dir/vmlinuz ${EFIIMGDIR} - echo "EFI\\BOOT\\${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh + echo "${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh if [ -f "$iso_dir/initrd" ] ; then cp $iso_dir/initrd ${EFIIMGDIR} fi