diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-10-10 01:53:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-19 17:57:58 +0100 |
commit | c52dcb07b8371da656809410a03cf2fba0918afa (patch) | |
tree | e67e27790cfeb9c0e0369d5c1acc3b40bbf1d624 | |
parent | f9d29ab298717b9d5ef76e4bbd13177e513c206e (diff) | |
download | poky-c52dcb07b8371da656809410a03cf2fba0918afa.tar.gz |
grub-efi, gummiboot: Emit correct path in startup.nsh
when we generate hddimage and use it to prepare SD card
using scripts/contrib/mkefidisk.sh as described here
http://elinux.org/Minnowboard:MinnowMaxYoctoProject
The content of startup.nsh contains
bootx64.efi
but this file is actually not in same dir as startup.nsh
its in /EFI/BOOT so for this to work entry in startup.nsh
should be
fs0:\EFI\BOOT\bootx64.efi
Otherwise the image is D-O-A
(From OE-Core rev: 38fe481911e7c4e9f674ded8f66878dff9e12ce3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/grub-efi.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/gummiboot.bbclass | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 4ddc2bb125..9a4220abdc 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass | |||
@@ -52,7 +52,8 @@ efi_iso_populate() { | |||
52 | mkdir -p ${EFIIMGDIR}/${EFIDIR} | 52 | mkdir -p ${EFIIMGDIR}/${EFIDIR} |
53 | cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} | 53 | cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} |
54 | cp $iso_dir/vmlinuz ${EFIIMGDIR} | 54 | cp $iso_dir/vmlinuz ${EFIIMGDIR} |
55 | echo "${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh | 55 | EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') |
56 | echo "fs0:${EFIPATH}\\${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh | ||
56 | if [ -f "$iso_dir/initrd" ] ; then | 57 | if [ -f "$iso_dir/initrd" ] ; then |
57 | cp $iso_dir/initrd ${EFIIMGDIR} | 58 | cp $iso_dir/initrd ${EFIIMGDIR} |
58 | fi | 59 | fi |
diff --git a/meta/classes/gummiboot.bbclass b/meta/classes/gummiboot.bbclass index 3d9c08bbc9..9a97ac1753 100644 --- a/meta/classes/gummiboot.bbclass +++ b/meta/classes/gummiboot.bbclass | |||
@@ -46,7 +46,8 @@ efi_iso_populate() { | |||
46 | mkdir -p ${EFIIMGDIR}/${EFIDIR} | 46 | mkdir -p ${EFIIMGDIR}/${EFIDIR} |
47 | cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} | 47 | cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} |
48 | cp $iso_dir/vmlinuz ${EFIIMGDIR} | 48 | cp $iso_dir/vmlinuz ${EFIIMGDIR} |
49 | echo "${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh | 49 | EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') |
50 | echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh | ||
50 | if [ -f "$iso_dir/initrd" ] ; then | 51 | if [ -f "$iso_dir/initrd" ] ; then |
51 | cp $iso_dir/initrd ${EFIIMGDIR} | 52 | cp $iso_dir/initrd ${EFIIMGDIR} |
52 | fi | 53 | fi |