Merge pull request #117 from pycom/idf_ver_check

check IDF git 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=d072c55
 
 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,26 @@
 # 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_HASH=$2
+IDF_PATH=$1
+CURR_HASH=$(git -c core.abbrev=7 --git-dir=$IDF_PATH/.git rev-parse --short HEAD)
 
-if [ "${CURR_VER}" = "${IDF_VER}" ]; then
-    echo "IDF Version OK!"
+if [ "${CURR_HASH}" = "${IDF_HASH}" ]; then
+    echo "IDF Version OK! $IDF_HASH"
     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
-        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
+    echo "
+Incompatible IDF git hash:
+
+$IDF_HASH is expected from IDF_HASH from Makefile, but
+$CURR_HASH is what IDF_PATH=$IDF_PATH is pointing at.
+
+You should probably update one (or multiple) of:
+  * IDF_PATH environment variable
+  * IDF_HASH variable in esp32/Makefile
+  * IDF commit, e.g.
+cd \$IDF_PATH && git checkout $IDF_HASH && git submodule sync && git submodule update --init --recursive && cd -
+
+"
+    exit 1
+fi