From 8bde372c3291469ed65d772f104b19100ce55e34 Mon Sep 17 00:00:00 2001 From: Junjie Mao Date: Fri, 19 Oct 2018 21:52:15 +0800 Subject: [PATCH] kconfig: enforce remaking config.mk after oldconfig changes .config Without any command under the .config target, config.mk will not be remade in the same execution of make after oldconfig changes .config. This can result to inconsistency between .config and the built image right after .config is changed. Tracked-On: #1588 Signed-off-by: Junjie Mao Reviewed-by: Anthony Xu --- hypervisor/scripts/kconfig/kconfig.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hypervisor/scripts/kconfig/kconfig.mk b/hypervisor/scripts/kconfig/kconfig.mk index 7b3e814d7..4a24f301e 100644 --- a/hypervisor/scripts/kconfig/kconfig.mk +++ b/hypervisor/scripts/kconfig/kconfig.mk @@ -38,7 +38,11 @@ $(eval $(call check_dep_py3lib,kconfiglib,KCONFIG_DEPS)) # This target invoke silentoldconfig to generate or update a .config. Useful as # a prerequisite of other targets depending on .config. +# +# A dummy command is necessary to trigger the remaking of config.mk right after +# oldconfig changes HV_CONFIG in the same execution of make. $(HV_OBJDIR)/$(HV_CONFIG): oldconfig + @true # Note: This target must not depend on a phony target (e.g. oldconfig) because # it'll trigger endless re-execution of make.