From: Juergen Gross <jgross@suse.com>
Date: Wed, 3 Jun 2020 11:28:07 +0000 (+0200)
Subject: fix build with CONFIG_HYPFS_CONFIG enabled
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~106
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1c5db7cc7a7080056d2876cd00344eb8b94bb7d2;p=xen.git

fix build with CONFIG_HYPFS_CONFIG enabled

Commit 58263ed7713e ("xen: add /buildinfo/config entry to hypervisor
filesystem") added a dependency to .config, but the hypervisor's build
config could be have another name via setting KCONFIG_CONFIG.

Fix that by using $(KCONFIG_CONFIG) instead. Additionally reference
the config file via $(XEN_ROOT) instead of a relative path.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 91581e1815..06881d023c 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -75,7 +75,8 @@ obj-$(CONFIG_UBSAN) += ubsan/
 obj-$(CONFIG_NEEDS_LIBELF) += libelf/
 obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
 
-config.gz: ../.config
+CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(XEN_ROOT)/xen/)$(KCONFIG_CONFIG)
+config.gz: $(CONF_FILE)
 	gzip -c $< >$@
 
 config_data.o: config.gz