From 1d7d2f06a978a443ce86e1912ccf275f949dee79 Mon Sep 17 00:00:00 2001 From: Qiang Zhang Date: Wed, 1 Jun 2022 14:03:49 +0800 Subject: [PATCH] misc: config_tools: fix make deadloop on release build with debug scenario When I build a release acrn with a debug scenario like this: $ BOARD=nuc11tnbi5 SCENARIO=shared make -j1 RELEASE=y Following logs are repeated endlessly. /home/abc/workspace/mainline/acrn-hypervisor/build/hypervisor/configs/allocation.xml generated /home/abc/workspace/mainline/acrn-hypervisor/build/hypervisor/configs/unified.xml generated /home/abc/workspace/mainline/acrn-hypervisor/build/hypervisor/configs/config.mk generated scripts/makefile/config.mk:191: The command line sets RELEASE to be 'y', but an existing build is configured with 'n' scripts/makefile/config.mk:191: The configuration will be modified for RELEASE=y Because "BUILD_TYPE" was moved out of "DEBUG_OPTIONS" in scenario file, outdated transform script fails to extract information there and it always set 'CONFIG_RELEASE=n'. If a makefile is included with a rule for it, the rule will be executed first to generated new makefile. If it's updated, the make process will be reexecuted with new makefile. In the case above, build/hypervisor/configs/config.mk rule is executed every time make tries to include it. Unhandled different between `RELEASE` and `CONFIG_RELEASE` causes determine_build_type to update .scenario.xml which is a dependency of hypervisor/scripts/makefile/config.mk. Tracked-On: #7657 Signed-off-by: Qiang Zhang --- misc/config_tools/xforms/config_common.xsl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index 70afd248e..7e42e49e5 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -36,7 +36,7 @@ - + @@ -48,7 +48,6 @@ -