[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[XEN PATCH 1/2] xen/build: fixup path to merge_config.sh
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Stewart Hildebrand <stewart.hildebrand@xxxxxxxxxxxxxxx>
- Date: Tue, 12 May 2020 13:52:05 -0400
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 207.242.234.14) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=dornerworks.com; dmarc=none action=none header.from=dornerworks.com; dkim=none (message not signed); arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector5401; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7l8Bmm/K7ceMetHeKL2gL9WtqQocfYzBFc4P4UDSMq0=; b=KRsbMeDaeO/TjmC5z7u2CxoWqgwrE3Tg49/JRHWt6w6/jgJUfV44RG4jvkKX0Op1sPJscEWOk/0z1cS0Tso+f9bFgmIyjCsDOuGupQSYojQ1FDIOi/C5AFdFtvDkm2Q3HKMdSEcjSB2T642AnN0kcmKIOrO3cvu1/J8qdY1ow+0VMSCUyqKDDWAi06OvF8g6VGsj4ZB2XGRS6fxBcIBnDXtPcaEVpuQwvfVjy4GJSts+MG/dgAlpMQ/O1T0EW64pG7/n02XmErOH4T/NeKShaRq6IvbvNaKBN66uVAbFI1vdzijuZXmOSL77rEbY1/11HfwUvDygPgJCm9Lq8kND7w==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector5401; d=microsoft.com; cv=none; b=bszWCxULPwViyELzgwQ9iWh894VcixMG5LXPWNNeLA0byL6hjInjmnzOei6Ow2xXHZcc8ZzBMGD3BWqcLHZScJUYheeJAXhbSY1e0RTg0rvy4zVJDv7oTdYC0WL1SkxoXGe7pyPKYjtF4PXFJLmys5gqZTNaJXZ36dGpwwBBWCWFaUT8g41xAu+OZTuwjnsHEOTHt661yc7QdsWyTlN/l42p6iRXy09iiIYM418ZwNdxDimA34mvNlInzcDECQOVryHAyGGvhVOtq+Rt/56zTe7Vo4pwRoFef9mwnR5Qn1cwVVL7FDIwNLIXhqN5gX6iINg6EAl9MvHseoReSBPBVw==
- Authentication-results: spf=fail (sender IP is 207.242.234.14) smtp.mailfrom=dornerworks.com; lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=dornerworks.com;
- Cc: Anthony PERARD <anthony.perard@xxxxxxxxxx>, Doug Goldstein <cardoe@xxxxxxxxxx>
- Delivery-date: Tue, 12 May 2020 17:52:23 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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 <stewart.hildebrand@xxxxxxxxxxxxxxx>
---
xen/tools/kconfig/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.26.2
|
