]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths
authorJan Stancek <jstancek@redhat.com>
Wed, 25 Feb 2026 19:30:23 +0000 (20:30 +0100)
committerBorislav Petkov (AMD) <bp@alien8.de>
Wed, 4 Mar 2026 10:51:08 +0000 (11:51 +0100)
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: 61b57d35396a ("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
arch/x86/boot/compressed/Makefile

index 68f9d7a1683b573f721647accfea82ad68136815..b8b2b7bea1d31aaf130ee46bd73d7ef9c9c425b4 100644 (file)
@@ -113,6 +113,7 @@ vmlinux-objs-$(CONFIG_EFI_SBAT) += $(obj)/sbat.o
 
 ifdef CONFIG_EFI_SBAT
 $(obj)/sbat.o: $(CONFIG_EFI_SBAT_FILE)
+AFLAGS_sbat.o += -I $(srctree)
 endif
 
 $(obj)/vmlinux: $(vmlinux-objs-y) $(vmlinux-libs-y) FORCE