Merge branch 'bugfix/mbedtls_submodule' into 'master'

mbedtls: Add submodule check at build time

See merge request idf/esp-idf!2395

components/mbedtls/component.mk

@@ -7,3 +7,6 @@ COMPONENT_ADD_INCLUDEDIRS := port/include mbedtls/include
 COMPONENT_SRCDIRS := mbedtls/library port
 
 COMPONENT_OBJEXCLUDE := mbedtls/library/net_sockets.o
+
+COMPONENT_SUBMODULES += mbedtls
+

make/project.mk

@@ -511,7 +511,7 @@ check-submodules: $(IDF_PATH)/$(1)/.git
 $(IDF_PATH)/$(1)/.git:
 	@echo "WARNING: Missing submodule $(1)..."
 	[ -e ${IDF_PATH}/.git ] || ( echo "ERROR: esp-idf must be cloned from git to work."; exit 1)
-	[ -x $$(which git) ] || ( echo "ERROR: Need to run 'git submodule init $(1)' in esp-idf root directory."; exit 1)
+	[ -x "$(shell which git)" ] || ( echo "ERROR: Need to run 'git submodule init $(1)' in esp-idf root directory."; exit 1)
 	@echo "Attempting 'git submodule update --init $(1)' in esp-idf root directory..."
 	cd ${IDF_PATH} && git submodule update --init $(1)