summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2013-10-30 12:35:17 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-12 17:00:09 +0000
commit8b4c1515f12e95b84a7ca8a87b40537a76c19a9c (patch)
tree8ecd57f33805b3d5dc3f06c11e04d72a46c2b413 /meta
parentd19f1a030e5e6dbc8b105a8525bef6d4611f5772 (diff)
downloadpoky-8b4c1515f12e95b84a7ca8a87b40537a76c19a9c.tar.gz
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. (From OE-Core master rev: 754b52ea7a3cdf8e7e939a314525d16c4dfb52cb) (From OE-Core rev: a65db42d4b0c6636ee6538a28930e4d19e170d18) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/grub-efi.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 3765bfd8a2..2f00901d04 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -49,7 +49,7 @@ grubefi_iso_populate() {
49 mkdir -p ${EFIIMGDIR}/${EFIDIR} 49 mkdir -p ${EFIIMGDIR}/${EFIDIR}
50 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} 50 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
51 cp $iso_dir/vmlinuz ${EFIIMGDIR} 51 cp $iso_dir/vmlinuz ${EFIIMGDIR}
52 echo "EFI\\BOOT\\${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh 52 echo "${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh
53 if [ -f "$iso_dir/initrd" ] ; then 53 if [ -f "$iso_dir/initrd" ] ; then
54 cp $iso_dir/initrd ${EFIIMGDIR} 54 cp $iso_dir/initrd ${EFIIMGDIR}
55 fi 55 fi