fix sdk build in python3 env (#279)

commaai · Sep 27, 2019 · b98ca01 · b98ca01
1 parent 63d3dc7
commit b98ca01
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/boardesp/get_sdk.sh b/boardesp/get_sdk.sh
@@ -8,5 +8,5 @@ sudo apt-get install libtool-bin
 git clone --recursive https://github.com/pfalcon/esp-open-sdk.git
 cd esp-open-sdk
 git checkout 03f5e898a059451ec5f3de30e7feff30455f7cec
-LD_LIBRARY_PATH="" make STANDALONE=y
-
+cp ../python2_make.py .
+python2 python2_make.py 'LD_LIBRARY_PATH="" make STANDALONE=y'
diff --git a/boardesp/get_sdk_ci.sh b/boardesp/get_sdk_ci.sh
@@ -2,4 +2,5 @@
 git clone --recursive https://github.com/pfalcon/esp-open-sdk.git
 cd esp-open-sdk
 git checkout 03f5e898a059451ec5f3de30e7feff30455f7cec
-LD_LIBRARY_PATH="" make STANDALONE=y
+cp ../python2_make.py .
+python2 python2_make.py 'LD_LIBRARY_PATH="" make STANDALONE=y'
diff --git a/boardesp/get_sdk_mac.sh b/boardesp/get_sdk_mac.sh
@@ -28,5 +28,5 @@ git checkout 03f5e898a059451ec5f3de30e7feff30455f7cec
 git submodule init
 git submodule update --recursive
 
-make STANDALONE=y
-
+cp ../python2_make.py .
+python2 python2_make.py 'make STANDALONE=y'
diff --git a/boardesp/python2_make.py b/boardesp/python2_make.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python2
+import os
+import sys
+os.system(sys.argv[1])
diff --git a/tests/build/Dockerfile b/tests/build/Dockerfile
@@ -10,6 +10,7 @@ ENV LC_ALL en_US.UTF-8
 RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
 
 ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
+RUN pyenv install 2.7.12
 RUN pyenv install 3.7.3
 RUN pyenv global 3.7.3
 RUN pyenv rehash
@@ -22,7 +23,8 @@ WORKDIR /panda/boardesp
 RUN git clone --recursive https://github.com/pfalcon/esp-open-sdk.git
 WORKDIR /panda/boardesp/esp-open-sdk
 RUN git checkout 03f5e898a059451ec5f3de30e7feff30455f7ce
-RUN CT_ALLOW_BUILD_AS_ROOT_SURE=1 make STANDALONE=y
+COPY ./boardesp/python2_make.py /panda/boardesp/esp-open-sdk
+RUN python2 python2_make.py "CT_ALLOW_BUILD_AS_ROOT_SURE=1 make STANDALONE=y"
 
 COPY . /panda