From 8673e659b48484a523141dd7ca7cf3fa9419e69a Mon Sep 17 00:00:00 2001 From: Tiago Medicci Serrano Date: Thu, 27 Jul 2023 13:35:59 -0300 Subject: [PATCH] espressif: quiet git commands and improve build logging Add `--quiet` to git commands to avoid unnecessary logging during the operation and add summarized logs to show progress. --- arch/risc-v/src/espressif/Make.defs | 7 ++++--- arch/xtensa/src/esp32s3/Wireless.mk | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/risc-v/src/espressif/Make.defs b/arch/risc-v/src/espressif/Make.defs index 34386782ed4cc..d02108d00612b 100644 --- a/arch/risc-v/src/espressif/Make.defs +++ b/arch/risc-v/src/espressif/Make.defs @@ -92,9 +92,10 @@ ifndef ESP_HAL_3RDPARTY_URL endif chip/$(ESP_HAL_3RDPARTY_REPO): - $(Q) echo "Cloning: Espressif HAL for 3rd Party Platforms" - $(Q) git clone $(ESP_HAL_3RDPARTY_URL) chip/$(ESP_HAL_3RDPARTY_REPO) - $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) checkout $(ESP_HAL_3RDPARTY_VERSION) + $(Q) echo "Cloning Espressif HAL for 3rd Party Platforms" + $(Q) git clone --quiet $(ESP_HAL_3RDPARTY_URL) chip/$(ESP_HAL_3RDPARTY_REPO) + $(Q) echo "Espressif HAL for 3rd Party Platforms: ${ESP_HAL_3RDPARTY_VERSION}" + $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) checkout --quiet $(ESP_HAL_3RDPARTY_VERSION) # Silent preprocessor warnings diff --git a/arch/xtensa/src/esp32s3/Wireless.mk b/arch/xtensa/src/esp32s3/Wireless.mk index 5090bf6d4d66a..7600e6cdc12b8 100644 --- a/arch/xtensa/src/esp32s3/Wireless.mk +++ b/arch/xtensa/src/esp32s3/Wireless.mk @@ -29,19 +29,19 @@ ifndef ESP_HAL_3RDPARTY_URL endif chip/$(ESP_HAL_3RDPARTY_REPO): - $(Q) echo "Cloning: ESP Wireless Drivers" - $(Q) git clone $(ESP_HAL_3RDPARTY_URL) chip/$(ESP_HAL_3RDPARTY_REPO) - $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) checkout $(ESP_HAL_3RDPARTY_VERSION) + $(Q) echo "Cloning Espressif HAL for 3rd Party Platforms" + $(Q) git clone --quiet $(ESP_HAL_3RDPARTY_URL) chip/$(ESP_HAL_3RDPARTY_REPO) + $(Q) echo "Espressif HAL for 3rd Party Platforms: checking out to ${ESP_HAL_3RDPARTY_VERSION}" + $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) checkout --quiet $(ESP_HAL_3RDPARTY_VERSION) # Silent preprocessor warnings CFLAGS += -Wno-undef -Wno-unused-variable context:: chip/$(ESP_HAL_3RDPARTY_REPO) - $(Q) echo "ESP Wireless Drivers: ${ESP_HAL_3RDPARTY_VERSION}" - $(Q) echo "Initializing submodules.." - $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) submodule update --init --depth=1 components/mbedtls/mbedtls components/esp_phy/lib components/esp_wifi/lib - $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO)/components/mbedtls/mbedtls reset --hard + $(Q) echo "Espressif HAL for 3rd Party Platforms: initializing submodules..." + $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO) submodule --quiet update --init --depth=1 components/mbedtls/mbedtls components/esp_phy/lib components/esp_wifi/lib + $(Q) git -C chip/$(ESP_HAL_3RDPARTY_REPO)/components/mbedtls/mbedtls reset --quiet --hard $(Q) echo "Applying patches..." $(Q) cd chip/$(ESP_HAL_3RDPARTY_REPO)/components/mbedtls/mbedtls && git apply ../../../nuttx/patches/components/mbedtls/mbedtls/*.patch