From 915f2c2051c19bf75a11381c3247fca255857e34 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 20 Jan 2013 18:25:21 +0400 Subject: [PATCH] efi: introduced use/efi/shell It's aimed at providing UEFI shell implementation which is very useful for repairs and debug; if the "signed" mode is requested then the signed variant is used either. Please note that there are two distinct uses: - a shell lying around on a filesystem to be copied by hand; - a shell available in EFI part of boot media to be launched by firmware's or standalone boot manager (e.g. refind). --- features.in/efi/config.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/features.in/efi/config.mk b/features.in/efi/config.mk index 8fdf46b3..4995d38a 100644 --- a/features.in/efi/config.mk +++ b/features.in/efi/config.mk @@ -7,7 +7,8 @@ use/efi: @$(call set,MKI_VER_MINIMAL,0.2.5) # see #28219 @$(call add,THE_LISTS,$(EFI_LISTS)) @$(call add,RESCUE_LISTS,$(EFI_LISTS)) - @$(call add,RESCUE_PACKAGES,refind efi-shell) + @$(call add,THE_PACKAGES,$$(EFI_SHELL)) + @$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL)) @$(call add,INSTALL2_PACKAGES,dosfstools) @$(call try,EFI_BOOTLOADER,elilo) # default one @@ -16,9 +17,13 @@ use/efi/refind: use/efi use/efi/signed: use/efi @$(call set,EFI_CERT,altlinux) - @$(call add,RESCUE_PACKAGES,refind-signed efi-shell-signed) + @$(call set,EFI_SHELL,efi-shell-signed) # even more useful + @$(call add,RESCUE_PACKAGES,refind-signed) @$(call add,RESCUE_PACKAGES,openssl sbsigntools) +use/efi/shell: use/efi + @$(call set,EFI_SHELL,efi-shell) + use/efi/debug: use/efi @$(call add,STAGE2_PACKAGES,efibootmgr gdisk) @$(call set,KFLAVOURS,led-ws) @@ -26,6 +31,6 @@ use/efi/debug: use/efi else # ignore on an unsupported target arch but make it hybrid at least -use/efi use/efi/refind use/efi/signed use/efi/debug: use/isohybrid +use/efi use/efi/refind use/efi/signed use/efi/shell use/efi/debug: use/isohybrid endif