check IDF git hash

instead of merely looking for the IDF git branch name, check the actual commit hash

secondly, stop automatically switching the IDF working copy. Simply check and fail if it is not the expected hash

Author: peter-pycom

esp32/Makefile

@@ -14,7 +14,7 @@ ifeq ($(wildcard boards/$(BOARD)/.),)
     $(error Invalid BOARD specified)
 endif
 
-IDF_VERSION=3.3.1
+IDF_HASH=d072c551c360e95b36814acd07a2ecd60ec7362c
 
 TARGET ?= boot_app
 

esp32/application.mk

@@ -820,7 +820,7 @@ $(OBJ): | $(GEN_PINS_HDR)
 
 # Check Dependencies (IDF version, Frozen code and IDF LIBS)
 CHECK_DEP:
-	$(Q) bash tools/idfVerCheck.sh $(IDF_PATH) "$(IDF_VERSION)"
+	$(Q) bash tools/idfVerCheck.sh $(IDF_PATH) "$(IDF_HASH)"
 	$(Q) bash tools/mpy-build-check.sh $(BOARD) $(BTYPE) $(VARIANT)
 	$(Q) $(PYTHON) check_secure_boot.py --SECURE $(SECURE)
 ifeq ($(COPY_IDF_LIB), 1)

esp32/tools/idfVerCheck.sh

@@ -8,26 +8,14 @@
 # available at https://www.pycom.io/opensource/licensing
 #
 
-IDF_VER="idf_v"$2
-CURR_VER="$(git --git-dir=$1/.git branch | grep \* | cut -d ' ' -f2)"
+IDF_VER=$2
+IDF_PATH=$1
+CURR_VER=$(git --git-dir=$IDF_PATH/.git rev-parse HEAD)
 
 if [ "${CURR_VER}" = "${IDF_VER}" ]; then
     echo "IDF Version OK!"
     exit 0
 else
-    echo "Incompatible IDF version...Checking out IDF version $2!"
-    if ! git --git-dir=$1/.git --work-tree=$1 checkout ${IDF_VER} ; then
-        echo "Cannot checkout IDF version ${IDF_VER}!...Please make sure latest idf_v${IDF_VER} branch is fetched" >&2
+    echo "Incompatible IDF version... Expected $IDF_VER, but $IDF_PATH is pointing at $CURR_VER"
         exit 1
-    fi
-    cd ${IDF_PATH}
-    if ! git submodule sync ; then
-        echo "Cannot checkout IDF version ${IDF_VER}!...Please make sure latest idf_v${IDF_VER} branch is fetched" >&2
-        exit 1
-    fi
-    if ! git submodule update --init ; then
-        echo "Cannot checkout IDF version ${IDF_VER}!...Please make sure latest idf_v${IDF_VER} branch is fetched" >&2
-        exit 1
-    fi
-    exit 0
-fi
+fi