Skip to content
Commit d4f38618 authored by Benjamin Segall's avatar Benjamin Segall Committed by Greg Kroah-Hartman
Browse files

x86/boot: Don't add the EFI stub to targets, again



commit b2747f10 upstream.

This is a re-commit of

  da05b143 ("x86/boot: Don't add the EFI stub to targets")

after the tagged patch incorrectly reverted it.

vmlinux-objs-y is added to targets, with an assumption that they are all
relative to $(obj); adding a $(objtree)/drivers/...  path causes the
build to incorrectly create a useless
arch/x86/boot/compressed/drivers/...  directory tree.

Fix this just by using a different make variable for the EFI stub.

Fixes: cb8bda8a ("x86/boot/compressed: Rename efi_thunk_64.S to efi-mixed.S")
Signed-off-by: default avatarBen Segall <bsegall@google.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Cc: stable@vger.kernel.org # v6.1+
Link: https://lore.kernel.org/r/xm267ceukksz.fsf@bsegall.svl.corp.google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db20d4e4
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment