On Tue, Jan 25, 2022 at 11:00:59AM +0000, Anthony PERARD wrote:
> $(srctree) is a better description for the source directory than
> $(BASEDIR) that has been used for both source and build directory
> (which where the same).
>
> This adds $(srctree) to a few path where make's VPATH=$(srctree) won't
> apply. And replace $(BASEDIR) by $(srctree).
>
> Introduce "$(srcdir)" as a shortcut for "$(srctree)/$(src)" as the
> later is used often enough.
>
> Signed-off-by: Anthony PERARD <anthony.per...@citrix.com>
> Acked-by: Jan Beulich <jbeul...@suse.com>
This patch is now missing two hunks due to recent changes in the tree:
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 11ac0d5e28a4..1ab9db3424c2 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -153,7 +153,7 @@ $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
>$(@D)/$(@F).map
rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]*
ifeq ($(CONFIG_XEN_IBT),y)
- $(SHELL) $(BASEDIR)/tools/check-endbr.sh $@
+ $(SHELL) $(srctree)/tools/check-endbr.sh $@
endif
$(obj)/note.o: $(TARGET)-syms
@@ -226,7 +226,7 @@ endif
| $(objtree)/tools/symbols --all-symbols --xensyms --sysv
--sort >$(@D)/$(@F).map
rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]*
ifeq ($(CONFIG_XEN_IBT),y)
- $(SHELL) $(BASEDIR)/tools/check-endbr.sh $@
+ $(SHELL) $(srctree)/tools/check-endbr.sh $@
endif
else
$(TARGET).efi: FORCE
--
Anthony PERARD
