[PATCH] arch/x86: add $(srctree) as include dir for sbat.o

[PATCH] arch/x86: add $(srctree) as include dir for sbat.o

[Jan Stancek]

CONFIG_EFI_SBAT_FILE can be a relative path. When compiling with
objdir != srctree the build currently fails because it can't find
the file 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.

Fixes: 61b57d35396a ("x86/efi: Implement support for embedding SBAT data for x86")
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
 arch/x86/boot/compressed/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 68f9d7a1683b..b8b2b7bea1d3 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -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
-- 
2.47.3

[PATCH v2] x86: add $(srctree) as include dir for sbat.o

[Jan Stancek]

CONFIG_EFI_SBAT_FILE can be a relative path. When compiling with
objdir != srctree the build currently fails because it can't find
the file 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.

Fixes: 61b57d35396a ("x86/efi: Implement support for embedding SBAT data for x86")
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
 arch/x86/boot/compressed/Makefile | 1 +
 1 file changed, 1 insertion(+)

Changes in v2: updated shortlog

diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 68f9d7a1683b..b8b2b7bea1d3 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -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
-- 
2.47.3

Re: [PATCH v2] x86: add $(srctree) as include dir for sbat.o

[Vitaly Kuznetsov]

Jan Stancek <jstancek@redhat.com> writes:

> CONFIG_EFI_SBAT_FILE can be a relative path. When compiling with
> objdir != srctree the build currently fails because it can't find
> the file 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.
>
> Fixes: 61b57d35396a ("x86/efi: Implement support for embedding SBAT data for x86")
> Signed-off-by: Jan Stancek <jstancek@redhat.com>
> ---
>  arch/x86/boot/compressed/Makefile | 1 +
>  1 file changed, 1 insertion(+)
>
> Changes in v2: updated shortlog
>
> diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
> index 68f9d7a1683b..b8b2b7bea1d3 100644
> --- a/arch/x86/boot/compressed/Makefile
> +++ b/arch/x86/boot/compressed/Makefile
> @@ -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

Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>

Thanks for the fix!

-- 
Vitaly

[tip: x86/urgent] x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths

[tip-bot2 for Jan Stancek]

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     3d1973a0c76a78a4728cff13648a188ed486cf44
Gitweb:        https://git.kernel.org/tip/3d1973a0c76a78a4728cff13648a188ed486cf44
Author:        Jan Stancek <jstancek@redhat.com>
AuthorDate:    Wed, 25 Feb 2026 20:30:23 +01:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Wed, 04 Mar 2026 11:51:08 +01:00

x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths

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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 68f9d7a..b8b2b7b 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -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