# HG changeset patch # User Pascal Bellard # Date 1525182321 -7200 # Node ID b127c8621a46e744ba3cfe7480e1ae701b134b51 # Parent ee171d0eb29465a27b897d2b1f14880cfc154396 fix grub2-efi arch for x86_64 (thanks alanyih) diff -r ee171d0eb294 -r b127c8621a46 grub2/receipt --- a/grub2/receipt Tue May 01 16:03:13 2018 +0300 +++ b/grub2/receipt Tue May 01 15:45:21 2018 +0200 @@ -39,7 +39,13 @@ install -Dm0644 $stuff/example-grub.cfg $install/boot/grub/example-grub.cfg ;; efi) - export EFI_ARCH=i386 + case $ARCH in + i?86) bootimg=bootia32.efi + EFI_ARCH=i386;; + x86_64) bootimg=bootx64.efi + EFI_ARCH=x86_64;; + esac + export EFI_ARCH ./configure \ --with-platform=efi \ --target=$EFI_ARCH \ @@ -51,8 +57,8 @@ cd grub-core ../grub-mkimage \ -d . \ - -o ../bootia32.efi \ - -O i386-efi \ + -o ../$bootimg \ + -O $EFI_ARCH-efi \ -p /boot/grub \ ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \ iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \