almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Use shim on aarch64.

Browse Source 
We have shim and grub working together on aarch64 now, so we may as well
use them.

(this also makes the case of boot${arch}.efi not mixed-case, which
should guarantee it's in FAT rather than VFAT...)

Related: rhbz#1100048

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2014-09-26 16:40:38 -04:00 committed by Brian C. Lane
parent 4681deb40b
commit 6907567664
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/aarch64.tmpl
View File

@ -27,7 +27,7 @@ mkdir ${KERNELDIR}
<% efiargs=""; efigraft="" %> <% efiargs=""; efigraft="" %>
%if exists("boot/efi/EFI/*/grubaa64.efi"): %if exists("boot/efi/EFI/*/grubaa64.efi"):
<% <%
efiarch = 'AARCH64' efiarch = 'AA64'
efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
images = ["images/efiboot.img"] images = ["images/efiboot.img"]
for img in images: for img in images:

10
share/efi.tmpl
View File

@ -1,5 +1,6 @@
<%page args="configdir, KERNELDIR, efiarch, isolabel"/> <%page args="configdir, KERNELDIR, efiarch, isolabel"/>
<% <%
from string import lower
EFIBOOTDIR="EFI/BOOT" EFIBOOTDIR="EFI/BOOT"
APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns" APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns"
APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
@ -7,14 +8,9 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}
mkdir ${EFIBOOTDIR}/fonts/ mkdir ${EFIBOOTDIR}/fonts/
%if efiarch == 'AARCH64': install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.EFI
install boot/efi/EFI/*/grubaa64.efi ${EFIBOOTDIR}/BOOTAA64.efi
install boot/efi/EFI/*/grubaa64.efi ${EFIBOOTDIR}/grubaa64.efi
%else:
install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi
install boot/efi/EFI/*/MokManager.efi ${EFIBOOTDIR}/ install boot/efi/EFI/*/MokManager.efi ${EFIBOOTDIR}/
install boot/efi/EFI/*/gcdx64.efi ${EFIBOOTDIR}/grubx64.efi install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/grub${efiarch|lower}.efi
%endif
install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
## actually make the EFI images ## actually make the EFI images

2
share/runtime-install.tmpl
View File

@ -25,7 +25,7 @@ installpkg grubby
## arch-specific packages (bootloaders etc.) ## arch-specific packages (bootloaders etc.)
%if basearch == "aarch64": %if basearch == "aarch64":
installpkg grub2-efi grubby installpkg efibootmgr grub2-efi grubby
%endif %endif
%if basearch in ("arm", "armhfp"): %if basearch in ("arm", "armhfp"):
installpkg kernel-lpae installpkg kernel-lpae