From c3800aea661a0813fe01163b40c69983d546ba12 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Tue, 4 Aug 2020 00:29:39 +0800 Subject: [PATCH] Makefile: fix issue on make menuconfig The BOARD/SCENARIO envrionment variable should be passed in one shell command; Tracked-On: #5077 Signed-off-by: Victor Sun --- hypervisor/scripts/makefile/kconfig.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hypervisor/scripts/makefile/kconfig.mk b/hypervisor/scripts/makefile/kconfig.mk index 4b43a1443..68ea52e8a 100644 --- a/hypervisor/scripts/makefile/kconfig.mk +++ b/hypervisor/scripts/makefile/kconfig.mk @@ -68,8 +68,8 @@ $(HV_OBJDIR)/$(HV_CONFIG_H): $(HV_OBJDIR)/$(HV_CONFIG) .PHONY: defconfig defconfig: $(KCONFIG_DEPS) @mkdir -p $(HV_OBJDIR) - @BOARD=$(CONFIG_BOARD) SCENARIO=$(CONFIG_SCENARIO); \ - if ([ "$(KCONFIG_FILE)" = "" ] || ([ "$(KCONFIG_FILE)" != "" ] && [ ! -f $(KCONFIG_FILE) ])) && [ "$(CONFIG_XML_ENABLED)" != "true" ]; then \ + @if ([ "$(KCONFIG_FILE)" = "" ] || ([ "$(KCONFIG_FILE)" != "" ] && [ ! -f $(KCONFIG_FILE) ])) && [ "$(CONFIG_XML_ENABLED)" != "true" ]; then \ + BOARD=$(CONFIG_BOARD) SCENARIO=$(CONFIG_SCENARIO) \ python3 $(KCONFIG_DIR)/defconfig.py Kconfig $(HV_OBJDIR)/$(HV_CONFIG); \ else \ if [ "$(KCONFIG_FILE)" != "" ] && [ -f $(KCONFIG_FILE) ]; then \ @@ -82,6 +82,7 @@ defconfig: $(KCONFIG_DEPS) echo "Writing $(HV_OBJDIR)/$(HV_CONFIG) with $(BOARD_CFG_DIR)/$(BOARD).config"; \ cp $(TARGET_DIR)/scenarios/$(SCENARIO)/$(BOARD)/$(BOARD).config $(HV_OBJDIR)/$(HV_CONFIG); \ fi; \ + BOARD=$(CONFIG_BOARD) SCENARIO=$(CONFIG_SCENARIO) \ python3 $(KCONFIG_DIR)/silentoldconfig.py Kconfig $(HV_OBJDIR)/$(HV_CONFIG) RELEASE=$(RELEASE); \ fi