| Message ID | aa791c4d-2078-0280-4730-83fa4782d0ec@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86: adjust EFI-related build message | expand |
On 16/01/2020 09:01, Jan Beulich wrote: > As of commit 93249f7fc17c ("x86/efi: split compiler vs linker support"), > EFI support in xen.gz may be available even if no xen.efi gets > generated. Distinguish the cases when emitting the message. > > Also drop the pointlessly (afaict) left use of $(filter ...) (needed > only when used in $(if ...)), from the ifeq() introduced by 7059afb202ff > ("x86/Makefile: remove $(guard) use from $(TARGET).efi target"). > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -195,7 +195,7 @@ note_file := endif note_file_option ?= $(note_file) -ifeq ($(filter y,$(XEN_BUILD_PE)),y) +ifeq ($(XEN_BUILD_PE),y) $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ @@ -218,7 +218,8 @@ $(TARGET).efi: prelink-efi.o $(note_file rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* else $(TARGET).efi: FORCE - rm -f $@; echo 'EFI support disabled' + rm -f $@ + echo '$(if $(filter y,$(XEN_BUILD_EFI)),xen.efi generation,EFI support) disabled' endif efi/boot.init.o efi/runtime.o efi/compat.o efi/buildid.o efi/relocs-dummy.o: $(BASEDIR)/arch/x86/efi/built_in.o
As of commit 93249f7fc17c ("x86/efi: split compiler vs linker support"), EFI support in xen.gz may be available even if no xen.efi gets generated. Distinguish the cases when emitting the message. Also drop the pointlessly (afaict) left use of $(filter ...) (needed only when used in $(if ...)), from the ifeq() introduced by 7059afb202ff ("x86/Makefile: remove $(guard) use from $(TARGET).efi target"). Signed-off-by: Jan Beulich <jbeulich@suse.com>