summaryrefslogtreecommitdiffstats
path: root/meta/classes/grub-efi.bbclass
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-28 18:15:04 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-06 06:35:42 -0800
commitb6e36c019777b6049be09ba9b646a37aba588100 (patch)
tree72b53d96111c2de43e1d6c3c33c0dcfd3387ff8c /meta/classes/grub-efi.bbclass
parent9703185a83432ed78ed42a431ea479a4a11fefbf (diff)
downloadpoky-b6e36c019777b6049be09ba9b646a37aba588100.tar.gz
grub-efi*.bbclass: don't reference vmlinuz
Rather than renaming the kernel to vmlinuz and assuming the name is vmlinuz in the grub.cfg, copy to ${KERNEL_IMAGETYPE} and also use that value in the grub.cfg file. (From OE-Core rev: d37be17527b354fddb3a5740d0197c590d620f42) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/grub-efi.bbclass')
-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 4b5704c19c..90badc03a0 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -26,7 +26,7 @@ efi_iso_populate() {
26 # Build a EFI directory to create efi.img 26 # Build a EFI directory to create efi.img
27 mkdir -p ${EFIIMGDIR}/${EFIDIR} 27 mkdir -p ${EFIIMGDIR}/${EFIDIR}
28 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} 28 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
29 cp $iso_dir/vmlinuz ${EFIIMGDIR} 29 cp $iso_dir/${KERNEL_IMAGETYPE} ${EFIIMGDIR}
30 EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') 30 EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
31 printf 'fs0:%s\%s\n' "$EFIPATH" "$GRUB_IMAGE" > ${EFIIMGDIR}/startup.nsh 31 printf 'fs0:%s\%s\n' "$EFIPATH" "$GRUB_IMAGE" > ${EFIIMGDIR}/startup.nsh
32 if [ -f "$iso_dir/initrd" ] ; then 32 if [ -f "$iso_dir/initrd" ] ; then