diff options
-rw-r--r-- | meta/classes/grub-efi.bbclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 90badc03a0..ec692f1646 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass | |||
@@ -9,9 +9,16 @@ efi_populate() { | |||
9 | 9 | ||
10 | GRUB_IMAGE="grub-efi-bootia32.efi" | 10 | GRUB_IMAGE="grub-efi-bootia32.efi" |
11 | DEST_IMAGE="bootia32.efi" | 11 | DEST_IMAGE="bootia32.efi" |
12 | if [ "${TARGET_ARCH}" = "x86_64" ]; then | 12 | if [ -n "${MLPREFIX}" ]; then |
13 | GRUB_IMAGE="grub-efi-bootx64.efi" | 13 | if [ "${TARGET_ARCH_MULTILIB_ORIGINAL}" = "x86_64" ]; then |
14 | DEST_IMAGE="bootx64.efi" | 14 | GRUB_IMAGE="grub-efi-bootx64.efi" |
15 | DEST_IMAGE="bootx64.efi" | ||
16 | fi | ||
17 | else | ||
18 | if [ "${TARGET_ARCH}" = "x86_64" ]; then | ||
19 | GRUB_IMAGE="grub-efi-bootx64.efi" | ||
20 | DEST_IMAGE="bootx64.efi" | ||
21 | fi | ||
15 | fi | 22 | fi |
16 | install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}${EFIDIR}/${DEST_IMAGE} | 23 | install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}${EFIDIR}/${DEST_IMAGE} |
17 | EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') | 24 | EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') |