efi: portability fix on aarch64

Signed UEFI loader not required for aarch64. NB: i586 images don't need UEFI SB either and 32-bit shim is used for x86_64 images along with proper 64-bit one.

efi: portability fix on aarch64
d4abcecb · Anton Midyukov · Michael Shigorin · d77259a5 · d4abcecb
Commit d4abcecb authored Jul 03, 2019 by Anton Midyukov Committed by Michael Shigorin Jul 08, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

config.mk features.in/efi/config.mk +9 -7

No files found.
--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -22,16 +22,13 @@ endif
 ifeq (distro,$(IMAGE_CLASS))
 	@$(call add,THE_PACKAGES,installer-feature-efi-stage3)
 	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
-	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL) $$(EFI_BOOTLOADER))
 	@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
 	@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFI_VARS FB_EFI)
 	@$(call add,EFI_BOOTARGS,$$(STAGE2_BOOTARGS))
+ifeq (x86_64,$(ARCH))
+	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL) $$(EFI_BOOTLOADER))
+endif
 endif
-
-use/efi/signed: use/efi
-	@$(call set,EFI_CERT,altlinux)
-	@$(call add,COMMON_PACKAGES,shim-signed)
-	@$(call add,RESCUE_PACKAGES,openssl pesign)

 use/efi/shell: use/efi
 	@$(call try,EFI_SHELL,efi-shell)
@@ -41,6 +38,11 @@ use/efi/grub: use/efi use/bootloader/grub

 ifeq (x86_64,$(ARCH))

+use/efi/signed: use/efi
+	@$(call set,EFI_CERT,altlinux)
+	@$(call add,COMMON_PACKAGES,shim-signed)
+	@$(call add,RESCUE_PACKAGES,openssl pesign)
+
 use/efi/lilo: use/efi use/bootloader/lilo
 	@$(call set,EFI_BOOTLOADER,elilo)

@@ -52,7 +54,7 @@ use/efi/memtest86: use/efi/refind

 else

-use/efi/refind use/efi/memtest86 use/efi/lilo: use/efi; @:
+use/efi/signed use/efi/refind use/efi/memtest86 use/efi/lilo: use/efi; @:

 endif