Skip to content

Commit 3520c16

Browse files
jstancekSasha Levin
authored andcommitted
x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths
commit 3d1973a upstream. CONFIG_EFI_SBAT_FILE can be a relative path. When compiling using a different output directory (O=) the build currently fails because it can't find the filename set in CONFIG_EFI_SBAT_FILE: arch/x86/boot/compressed/sbat.S: Assembler messages: arch/x86/boot/compressed/sbat.S:6: Error: file not found: kernel.sbat Add $(srctree) as include dir for sbat.o. [ bp: Massage commit message. ] Fixes: 61b57d3 ("x86/efi: Implement support for embedding SBAT data for x86") Signed-off-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com> Cc: <stable@kernel.org> Link: https://patch.msgid.link/f4eda155b0cef91d4d316b4e92f5771cb0aa7187.1772047658.git.jstancek@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 67508f6 commit 3520c16

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/boot/compressed/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ vmlinux-objs-$(CONFIG_EFI_SBAT) += $(obj)/sbat.o
113113

114114
ifdef CONFIG_EFI_SBAT
115115
$(obj)/sbat.o: $(CONFIG_EFI_SBAT_FILE)
116+
AFLAGS_sbat.o += -I $(srctree)
116117
endif
117118

118119
$(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE

0 commit comments

Comments
 (0)