From b87070f95ac7f4dd17d62dca3a5cfd77dc3e3005 Mon Sep 17 00:00:00 2001 From: Geoffroy Van Cutsem Date: Mon, 7 Dec 2020 11:12:44 +0100 Subject: [PATCH] Revert "hv: fix formatting for cfg.log output" This reverts commit e2590d88aa3e1c72dc6473eadc83312412a604b3. It introdcues a regression for systems that have '/bin/sh' pointing at '/bin/bash'. Tracked-On: #5588 Signed-off-by: Geoffroy Van Cutsem --- Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index f7791797b..e8e76f6b6 100644 --- a/Makefile +++ b/Makefile @@ -148,28 +148,28 @@ hypervisor: $(MAKE) -C $(T)/hypervisor BOARD=$(BOARD) HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(TARGET_DIR) defconfig; $(MAKE) -C $(T)/hypervisor BOARD=$(BOARD) HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(TARGET_DIR) oldconfig; $(MAKE) -C $(T)/hypervisor BOARD=$(BOARD) HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(TARGET_DIR) - @echo "\n\033[47;30mACRN Configuration Summary:\033[0m \nBOARD = $(BOARD)\t SCENARIO = $(SCENARIO)" > $(HV_CFG_LOG); \ - echo "BUILD type = \c" >> $(HV_CFG_LOG); \ - if [ "$(RELEASE)" = "0" ]; then echo "DEBUG" >> $(HV_CFG_LOG); else echo "RELEASE" >> $(HV_CFG_LOG); fi; \ + @echo -e "\n\033[47;30mACRN Configuration Summary:\033[0m \nBOARD = $(BOARD)\t SCENARIO = $(SCENARIO)" > $(HV_CFG_LOG); \ + echo -e "BUILD type = \c" >> $(HV_CFG_LOG); \ + if [ "$(RELEASE)" = "0" ]; then echo -e "DEBUG" >> $(HV_CFG_LOG); else echo -e "RELEASE" >> $(HV_CFG_LOG); fi; \ if [ -f $(KCONFIG_FILE) ]; then \ - echo "Hypervisor configuration is based on:\n\tKconfig file:\t$(KCONFIG_FILE);" >> $(HV_CFG_LOG); \ + echo -e "Hypervisor configuration is based on:\n\tKconfig file:\t$(KCONFIG_FILE);" >> $(HV_CFG_LOG); \ fi; \ - echo "Hypervisor configuration is based on:" >> $(HV_CFG_LOG); \ + echo -e "Hypervisor configuration is based on:" >> $(HV_CFG_LOG); \ if [ "$(TARGET_DIR)" = "" ]; then \ if [ ! -f $(KCONFIG_FILE) ]; then \ - echo "\tdefconfig file:\t\t\t$(VM_CONFIGS_DIR)/$(DEFCONFIG_FILE);" >> $(HV_CFG_LOG); \ + echo -e "\tdefconfig file:\t\t\t$(VM_CONFIGS_DIR)/$(DEFCONFIG_FILE);" >> $(HV_CFG_LOG); \ fi; \ elif [ ! -f $(KCONFIG_FILE) ]; then \ - echo "\tdefconfig file:\t\t\t$(TARGET_DIR)/$(DEFCONFIG_FILE);" >> $(HV_CFG_LOG); \ + echo -e "\tdefconfig file:\t\t\t$(TARGET_DIR)/$(DEFCONFIG_FILE);" >> $(HV_CFG_LOG); \ fi; \ - echo "\tOthers are set by default in:\t$(T)/hypervisor/arch/x86/Kconfig;" >> $(HV_CFG_LOG); \ - echo "VM configuration is based on:" >> $(HV_CFG_LOG); \ + echo -e "\tOthers are set by default in:\t$(T)/hypervisor/arch/x86/Kconfig;" >> $(HV_CFG_LOG); \ + echo -e "VM configuration is based on:" >> $(HV_CFG_LOG); \ if [ "$(CONFIG_XML_ENABLED)" = "true" ]; then \ - echo "\tBOARD File:\t\t$(BOARD_FILE);\n\t\tSCENARIO File:\t$(SCENARIO_FILE);" >> $(HV_CFG_LOG); \ + echo -e "\tBOARD File:\t\t$(BOARD_FILE);\n\t\tSCENARIO File:\t$(SCENARIO_FILE);" >> $(HV_CFG_LOG); \ elif [ "$(TARGET_DIR)" = "" ]; then \ - echo "\tSource code at:\t\t\t$(VM_CONFIGS_DIR)" >> $(HV_CFG_LOG); \ + echo -e "\tSource code at:\t\t\t$(VM_CONFIGS_DIR)" >> $(HV_CFG_LOG); \ else \ - echo "\tSource code at:\t\t\t$(TARGET_DIR)" >> $(HV_CFG_LOG); \ + echo -e "\tSource code at:\t\t\t$(TARGET_DIR)" >> $(HV_CFG_LOG); \ fi; @cat $(HV_CFG_LOG)