aboutsummaryrefslogtreecommitdiffstats
path: root/meta-intel-extras/classes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-08-15 13:38:19 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-08-17 06:45:34 +0000
commit90c3cf671a82bfc7e3c8d3071692650ed6bbe8e8 (patch)
tree4d98eaee2f25217874e7c4fde6e816212fc4a782 /meta-intel-extras/classes
parent623eb86f258bab4ce7a70817ba668b83c1e1f3ef (diff)
intel: update grub-efi file name
Change-Id: I732eb903c0e92585e603e52ac8c250364d8cb031 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-intel-extras/classes')
-rw-r--r--meta-intel-extras/classes/image_dd_efi.bbclass9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 1f5fd9f7..4454051b 100644
--- a/meta-intel-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
@@ -35,10 +35,15 @@ inherit image_dd
EXTRA_IMAGECMD_ext3 += "-L rootfs"
do_populate_boot() {
+ GRUB_IMAGE="grub-efi-bootia32.efi"
+ DEST_IMAGE="bootia32.efi"
+ if [ "${TARGET_ARCH}" = "x86_64" ]; then
+ GRUB_IMAGE="grub-efi-bootx64.efi"
+ DEST_IMAGE="bootx64.efi"
+ fi
mkdir -p ${WORKDIR}/EFI/BOOT/
# Path where EFI firmware searches for EFI executable
- cp ${DEPLOY_DIR_IMAGE}/bootx64.efi ${WORKDIR}/EFI/BOOT/
+ cp ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${WORKDIR}/EFI/BOOT/${DEST_IMAGE}
mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI
}
-