public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arch/x86: add $(srctree) as include dir for sbat.o
@ 2026-01-06  8:01 Jan Stancek
  2026-02-25 19:30 ` [PATCH v2] x86: " Jan Stancek
  0 siblings, 1 reply; 4+ messages in thread
From: Jan Stancek @ 2026-01-06  8:01 UTC (permalink / raw)
  To: tglx, mingo, bp, dave.hansen, x86; +Cc: hpa, vkuznets, linux-kernel, jstancek

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH v2] x86: add $(srctree) as include dir for sbat.o
  2026-01-06  8:01 [PATCH] arch/x86: add $(srctree) as include dir for sbat.o Jan Stancek
@ 2026-02-25 19:30 ` Jan Stancek
  2026-03-04  8:45   ` Vitaly Kuznetsov
  2026-03-04 11:06   ` [tip: x86/urgent] x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths tip-bot2 for Jan Stancek
  0 siblings, 2 replies; 4+ messages in thread
From: Jan Stancek @ 2026-02-25 19:30 UTC (permalink / raw)
  To: tglx, mingo, bp, dave.hansen, x86; +Cc: hpa, vkuznets, linux-kernel, jstancek

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] x86: add $(srctree) as include dir for sbat.o
  2026-02-25 19:30 ` [PATCH v2] x86: " Jan Stancek
@ 2026-03-04  8:45   ` Vitaly Kuznetsov
  2026-03-04 11:06   ` [tip: x86/urgent] x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths tip-bot2 for Jan Stancek
  1 sibling, 0 replies; 4+ messages in thread
From: Vitaly Kuznetsov @ 2026-03-04  8:45 UTC (permalink / raw)
  To: Jan Stancek
  Cc: hpa, linux-kernel, jstancek, tglx, mingo, bp, dave.hansen, x86

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [tip: x86/urgent] x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths
  2026-02-25 19:30 ` [PATCH v2] x86: " Jan Stancek
  2026-03-04  8:45   ` Vitaly Kuznetsov
@ 2026-03-04 11:06   ` tip-bot2 for Jan Stancek
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Jan Stancek @ 2026-03-04 11:06 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Jan Stancek, Borislav Petkov (AMD), Vitaly Kuznetsov, stable, x86,
	linux-kernel

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-03-04 11:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-06  8:01 [PATCH] arch/x86: add $(srctree) as include dir for sbat.o Jan Stancek
2026-02-25 19:30 ` [PATCH v2] x86: " Jan Stancek
2026-03-04  8:45   ` Vitaly Kuznetsov
2026-03-04 11:06   ` [tip: x86/urgent] x86/boot: Handle relative CONFIG_EFI_SBAT_FILE file paths tip-bot2 for Jan Stancek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox