sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system/nxdiag: Fix race condition during build

Browse Source 
This commit fixed a race condition that might happen by only unshallowing the Espressif HAL only after it was completely cloned.
This commit is contained in:
Lucas Saavedra Vaz 2023-07-17 13:16:00 -03:00 committed by Xiang Xiao
parent 4bc06d9a4b
commit 6f56e69a14
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
system/nxdiag/Makefile
View File

@ -67,13 +67,20 @@ ARCH_ESP_HALDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)
# If the esp-hal-3rdparty directory is not in the arch directory, then it can be # If the esp-hal-3rdparty directory is not in the arch directory, then it can be
# cloned to the nxdiag directory for debugging purposes. # cloned to the nxdiag directory for debugging purposes.
HALDIR := $(shell if [ -d $(ARCH_ESP_HALDIR)$(DELIM).git ]; then echo "$(ARCH_ESP_HALDIR)"; else echo "$(NXDIAGDIR)$(DELIM)esp-hal-3rdparty"; fi) HALDIR := $(shell \
if [ -f $(ARCH_ESP_HALDIR)$(DELIM).git$(DELIM)index ]; then \
echo "$(ARCH_ESP_HALDIR)"; \
else \
echo "$(NXDIAGDIR)$(DELIM)esp-hal-3rdparty"; \
fi \
)
INFO_DEPS += espressif_prepare INFO_DEPS += espressif_prepare
espressif_prepare: espressif_prepare:
ifeq ($(HALDIR),$(ARCH_ESP_HALDIR)) ifeq ($(HALDIR),$(ARCH_ESP_HALDIR))
(cd ${HALDIR} && git fetch -q --depth=10000 && git fetch -q --tags) @echo "Unshallowing Espressif HAL..."
(cd ${HALDIR} && git fetch --depth=10000 && git fetch --tags)
endif endif
ifdef ESPTOOL_BINDIR ifdef ESPTOOL_BINDIR