summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-27 16:16:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:38:32 +0000
commit75df73526a31c63de0322c08baeac6d13dcfe461 (patch)
treef2b22941306636b4360c8acc335e39f21a9c9898 /meta/classes
parent3e833c681a2fd0f6d962441b23c76878f73285d4 (diff)
downloadpoky-75df73526a31c63de0322c08baeac6d13dcfe461.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/grub-efi.bbclass10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 3dc9146d90..8adda098c4 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -40,13 +40,15 @@ efi_populate() {
40 40
41 install -d ${DEST}${EFIDIR} 41 install -d ${DEST}${EFIDIR}
42 42
43 GRUB_IMAGE="bootia32.efi" 43 GRUB_IMAGE="grub-efi-bootia32.efi"
44 DEST_IMAGE="bootia32.efi"
44 if [ "${TARGET_ARCH}" = "x86_64" ]; then 45 if [ "${TARGET_ARCH}" = "x86_64" ]; then
45 GRUB_IMAGE="bootx64.efi" 46 GRUB_IMAGE="grub-efi-bootx64.efi"
47 DEST_IMAGE="bootx64.efi"
46 fi 48 fi
47 install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}${EFIDIR} 49 install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}${EFIDIR}/${DEST_IMAGE}
48 EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') 50 EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
49 printf 'fs0:%s\%s\n' "$EFIPATH" "$GRUB_IMAGE" >${DEST}/startup.nsh 51 printf 'fs0:%s\%s\n' "$EFIPATH" "$DEST_IMAGE" >${DEST}/startup.nsh
50 52
51 install -m 0644 ${GRUB_CFG} ${DEST}${EFIDIR}/grub.cfg 53 install -m 0644 ${GRUB_CFG} ${DEST}${EFIDIR}/grub.cfg
52} 54}