efi: whoops, non-x86_64 got broken

I've noted that this bit of code should be fixed up
before pushing but managed to overlook that in the end :(

mkimage version bump is due to the somewhat changed layout
of EFI packages and binaries within those (linked message in Russian):
http://lists.altlinux.org/pipermail/devel-distro/2013-December/001283.html
This commit is contained in:
Michael Shigorin 2013-12-24 11:54:01 +02:00
parent c4a6bab55c
commit 596a6bfe3d

View File

@ -6,7 +6,7 @@ EFI_LISTS := $(call tags,base efi)
use/efi: use/efi:
@$(call add_feature) @$(call add_feature)
@$(call set,MKI_VER_MINIMAL,0.2.5) # see #28219 @$(call set,MKI_VER_MINIMAL,0.2.12) # it's official now
@$(call add,THE_LISTS,$(EFI_LISTS)) @$(call add,THE_LISTS,$(EFI_LISTS))
@$(call add,RESCUE_LISTS,$(EFI_LISTS)) @$(call add,RESCUE_LISTS,$(EFI_LISTS))
@$(call add,THE_PACKAGES,$$(EFI_SHELL)) @$(call add,THE_PACKAGES,$$(EFI_SHELL))
@ -18,7 +18,6 @@ use/efi/refind: use/efi
@$(call set,EFI_BOOTLOADER,refind) @$(call set,EFI_BOOTLOADER,refind)
use/efi/signed: use/efi use/efi/signed: use/efi
@$(call set,MKI_VER_MINIMAL,0.2.7) # refind->elilo handoff ### 0.2.11
@$(call set,EFI_CERT,altlinux) @$(call set,EFI_CERT,altlinux)
@$(call add,THE_PACKAGES,shim-signed) @$(call add,THE_PACKAGES,shim-signed)
@$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools) @$(call add,RESCUE_PACKAGES,openssl pesign sbsigntools)
@ -36,6 +35,7 @@ use/efi/debug: use/efi
else else
# ignore on an unsupported target arch but make it hybrid at least # ignore on an unsupported target arch but make it hybrid at least
use/efi use/efi/refind use/efi/signed use/efi/shell use/efi/debug: use/isohybrid use/efi use/efi/signed use/efi/debug \
use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid
endif endif