diff options
| author | Angus Gratton <angus@redyak.com.au> | 2025-01-14 11:38:43 +1100 |
|---|---|---|
| committer | Angus Gratton <gus@projectgus.com> | 2025-01-29 11:41:32 +1100 |
| commit | ec527a11136e1c83ddf51099a418ea785215284f (patch) | |
| tree | ba184054de18ee3ac47d49a5e0e92125fab11f16 | |
| parent | f29bd5a65e9688222474e54b4f5d0fb127a23db3 (diff) | |
esp32: Disable component manager when running 'make submodules'.
- ECHO_SUBMODULES=1 exits CMake early. With idf_component_manager 1.x this
seems to leave the managed_components directory in a state that causes
later builds to fail.
- Looks like the component manager isn't needed for this step, so disable
it. This invocation logs a warning (not visible in normal output) but
completes successfully and returns the correct list of submodules.
Signed-off-by: Angus Gratton <angus@redyak.com.au>
| -rw-r--r-- | ports/esp32/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile index 888818076..1c2fa82ce 100644 --- a/ports/esp32/Makefile +++ b/ports/esp32/Makefile @@ -112,6 +112,6 @@ size-files: # output and passes the list of submodules to py/mkrules.mk which does the # `git submodule init` on each. submodules: - @GIT_SUBMODULES=$$(idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build 2>&1 | \ + @GIT_SUBMODULES=$$(IDF_COMPONENT_MANAGER=0 idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build 2>&1 | \ grep '^GIT_SUBMODULES=' | cut -d= -f2); \ $(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" submodules |