| Message ID | 20200515182509.5476-1-stewart.hildebrand@dornerworks.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [XEN,v2] xen/build: use the correct kconfig makefile | expand |
Friday, May 15, 2020 2:25 PM, Stewart Hildebrand wrote:
>Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>
I forgot to include Anthony's Reviewed-by from v1 https://lists.xenproject.org/archives/html/xen-devel/2020-05/msg00848.html
On Fri, May 15, 2020 at 02:25:09PM -0400, Stewart Hildebrand wrote: > This resolves the following observed error during config merge: > > /bin/sh /path/to/xen/xen/../xen/tools/kconfig/merge_config.sh -m .config /path/to/xen/xen/../xen/arch/arm/configs/custom.config > Using .config as base > Merging /path/to/xen/xen/../xen/arch/arm/configs/custom.config > # > # merged configuration written to .config (needs make) > # > make -f /path/to/xen/xen/../xen/Makefile olddefconfig > make[2]: Entering directory '/path/to/xen/xen' > make[2]: *** No rule to make target 'olddefconfig'. Stop. > make[2]: Leaving directory '/path/to/xen/xen' > tools/kconfig/Makefile:95: recipe for target 'custom.config' failed > > The build was invoked by first doing a defconfig (which succeeded): > > $ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig > > Followed by the config fragment merge command (which failed before this patch) > > $ cat > xen/arch/arm/configs/custom.config <<EOF > CONFIG_DEBUG=y > CONFIG_EARLY_PRINTK_ZYNQMP=y > EOF > $ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- custom.config > > Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com> > > --- > v2: updated commit message Reviewed-by: Anthony PERARD <anthony.perard@citrix.com> Thanks,
diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile index fd37f4386a..f39521a0ed 100644 --- a/xen/tools/kconfig/Makefile +++ b/xen/tools/kconfig/Makefile @@ -94,7 +94,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)/tools/kconfig/merge_config.sh -m .config $(configfiles) - $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig + $(Q)$(MAKE) -f $(srctree)/tools/kconfig/Makefile.kconfig olddefconfig PHONY += kvmconfig kvmconfig: kvm_guest.config
This resolves the following observed error during config merge: /bin/sh /path/to/xen/xen/../xen/tools/kconfig/merge_config.sh -m .config /path/to/xen/xen/../xen/arch/arm/configs/custom.config Using .config as base Merging /path/to/xen/xen/../xen/arch/arm/configs/custom.config # # merged configuration written to .config (needs make) # make -f /path/to/xen/xen/../xen/Makefile olddefconfig make[2]: Entering directory '/path/to/xen/xen' make[2]: *** No rule to make target 'olddefconfig'. Stop. make[2]: Leaving directory '/path/to/xen/xen' tools/kconfig/Makefile:95: recipe for target 'custom.config' failed The build was invoked by first doing a defconfig (which succeeded): $ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig Followed by the config fragment merge command (which failed before this patch) $ cat > xen/arch/arm/configs/custom.config <<EOF CONFIG_DEBUG=y CONFIG_EARLY_PRINTK_ZYNQMP=y EOF $ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- custom.config Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com> --- v2: updated commit message --- xen/tools/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)