[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4381/8267] grub-efi.bbclass: use 'grub-efi-' prefix

[Emmanuele Bassi <ebassi src gnome org>]

commit 75df73526a31c63de0322c08baeac6d13dcfe461
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Jan 27 16:16:05 2017 +0200

    grub-efi.bbclass: use 'grub-efi-' prefix
    
    grub-efi recipe added 'grub-efi-' prefix to the file name of
    efi binary. Changed grub-efi.bbclass accordingly.
    
    (From OE-Core rev: 860c44435ea7cbbe3517d5ab9146213cc80fd0e7)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/grub-efi.bbclass |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 3dc9146..8adda09 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -40,13 +40,15 @@ efi_populate() {
 
        install -d ${DEST}${EFIDIR}
 
-       GRUB_IMAGE="bootia32.efi"
+       GRUB_IMAGE="grub-efi-bootia32.efi"
+       DEST_IMAGE="bootia32.efi"
        if [ "${TARGET_ARCH}" = "x86_64" ]; then
-               GRUB_IMAGE="bootx64.efi"
+               GRUB_IMAGE="grub-efi-bootx64.efi"
+               DEST_IMAGE="bootx64.efi"
        fi
-       install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}${EFIDIR}
+       install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}${EFIDIR}/${DEST_IMAGE}
        EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
-       printf 'fs0:%s\%s\n' "$EFIPATH" "$GRUB_IMAGE" >${DEST}/startup.nsh
+       printf 'fs0:%s\%s\n' "$EFIPATH" "$DEST_IMAGE" >${DEST}/startup.nsh
 
        install -m 0644 ${GRUB_CFG} ${DEST}${EFIDIR}/grub.cfg
 }