From: Stewart Hildebrand Date: Tue, 12 May 2020 17:52:05 +0000 (-0400) Subject: xen/build: fixup path to merge_config.sh X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~261 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=90b1701905dd0cbb7efe525b1bf92007fe818b60;p=xen.git xen/build: fixup path to merge_config.sh This resolves the following observed error: /bin/sh: /path/to/xen/xen/../xen/scripts/kconfig/merge_config.sh: No such file or directory Signed-off-by: Stewart Hildebrand Reviewed-by: Anthony PERARD --- diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile index ef2f2336c4..fd37f4386a 100644 --- a/xen/tools/kconfig/Makefile +++ b/xen/tools/kconfig/Makefile @@ -93,7 +93,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c %.config: $(obj)/conf $(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles) + $(Q)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles) $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig PHONY += kvmconfig