From 0ea1b3070eaa946add47c629c2c15717f8f881fe Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Wed, 30 Dec 2015 15:08:31 +1100
Subject: [PATCH] Travis: esptool2 now in its own repository

---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31e3f19..b22d9bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,13 @@ env:
   OPENSDK_COMMIT=cd1d336
   CROSS_ROOT="${HOME}/toolchain-${OPENSDK_COMMIT}"
   CROSS_BINDIR="${CROSS_ROOT}/bin"
-  ESPTOOL2_COMMIT=92530bb8
-  ESPTOOL2_BINDIR="${HOME}/esptool2-${ESPTOOL2_COMMIT}"
-  PATH=${PATH}:${CROSS_BINDIR}:${ESPTOOL2_BINDIR}
+  ESPTOOL2_COMMIT=ec0e2c7
+  ESPTOOL2_DIR="${HOME}/esptool2-${ESPTOOL2_COMMIT}"
+  PATH=${PATH}:${CROSS_BINDIR}:${ESPTOOL2_DIR}
 cache:
   directories:
     - ${CROSS_ROOT}
-    - ${ESPTOOL2_BINDIR}
+    - ${ESPTOOL2_DIR}
 addons:
   apt:
     packages:
@@ -48,11 +48,11 @@ before_install:
   - ${HAS_TC} || sed -i "s/2.69/2.68/" lx106-hal/configure.ac # this is a nasty hack as Ubuntu Precise only has autoconf 2.68 not 2.69...
   - ${HAS_TC} || sed -r -i 's%TOOLCHAIN ?=.*%TOOLCHAIN=${CROSS_ROOT}%' Makefile
   - ${HAS_TC} || make STANDALONE=n
-  - export HAS_ET2="test -f ${ESPTOOL2_BINDIR}/esptool2"
-  - ${HAS_ET2} || git clone https://github.com/raburton/esp8266 ${HOME}/raburton
-  - ${HAS_ET2} || make -C ${HOME}/raburton/esptool2
-  - ${HAS_ET2} || mkdir -p ${ESPTOOL2_BINDIR}
-  - ${HAS_ET2} || cp -a ${HOME}/raburton/esptool2/esptool2 ${ESPTOOL2_BINDIR}/
+  - export HAS_ET2="test -f ${ESPTOOL2_DIR}/esptool2"
+  - ${HAS_ET2} || git clone https://github.com/raburton/esptool2 ${ESPTOOL2_DIR}
+  - ${HAS_ET2} || cd ${ESPTOOL2_DIR}
+  - ${HAS_ET2} || git reset --hard ${ESPTOOL2_COMMIT}
+  - ${HAS_ET2} || make
 
 script:
   - cd ${TRAVIS_BUILD_DIR}