wok-next rev 20642
fix grub2-efi arch for x86_64 (thanks alanyih)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue May 01 15:45:21 2018 +0200 (2018-05-01) |
parents | ee171d0eb294 |
children | 60e1f57c9858 |
files | grub2/receipt |
line diff
1.1 --- a/grub2/receipt Tue May 01 16:03:13 2018 +0300 1.2 +++ b/grub2/receipt Tue May 01 15:45:21 2018 +0200 1.3 @@ -39,7 +39,13 @@ 1.4 install -Dm0644 $stuff/example-grub.cfg $install/boot/grub/example-grub.cfg 1.5 ;; 1.6 efi) 1.7 - export EFI_ARCH=i386 1.8 + case $ARCH in 1.9 + i?86) bootimg=bootia32.efi 1.10 + EFI_ARCH=i386;; 1.11 + x86_64) bootimg=bootx64.efi 1.12 + EFI_ARCH=x86_64;; 1.13 + esac 1.14 + export EFI_ARCH 1.15 ./configure \ 1.16 --with-platform=efi \ 1.17 --target=$EFI_ARCH \ 1.18 @@ -51,8 +57,8 @@ 1.19 cd grub-core 1.20 ../grub-mkimage \ 1.21 -d . \ 1.22 - -o ../bootia32.efi \ 1.23 - -O i386-efi \ 1.24 + -o ../$bootimg \ 1.25 + -O $EFI_ARCH-efi \ 1.26 -p /boot/grub \ 1.27 ntfs hfs appleldr boot cat efi_gop efi_uga elf fat hfsplus \ 1.28 iso9660 linux keylayouts memdisk minicmd part_apple ext2 extcmd \