Skip to content

Commit b98ca01

Browse files
authoredSep 27, 2019
fix sdk build in python3 env (#279)
1 parent 63d3dc7 commit b98ca01

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed
 

‎boardesp/get_sdk.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ sudo apt-get install libtool-bin
88
git clone --recursive https://github.com/pfalcon/esp-open-sdk.git
99
cd esp-open-sdk
1010
git checkout 03f5e898a059451ec5f3de30e7feff30455f7cec
11-
LD_LIBRARY_PATH="" make STANDALONE=y
12-
11+
cp ../python2_make.py .
12+
python2 python2_make.py 'LD_LIBRARY_PATH="" make STANDALONE=y'

‎boardesp/get_sdk_ci.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
git clone --recursive https://github.com/pfalcon/esp-open-sdk.git
33
cd esp-open-sdk
44
git checkout 03f5e898a059451ec5f3de30e7feff30455f7cec
5-
LD_LIBRARY_PATH="" make STANDALONE=y
5+
cp ../python2_make.py .
6+
python2 python2_make.py 'LD_LIBRARY_PATH="" make STANDALONE=y'

‎boardesp/get_sdk_mac.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ git checkout 03f5e898a059451ec5f3de30e7feff30455f7cec
2828
git submodule init
2929
git submodule update --recursive
3030

31-
make STANDALONE=y
32-
31+
cp ../python2_make.py .
32+
python2 python2_make.py 'make STANDALONE=y'

‎boardesp/python2_make.py

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env python2
2+
import os
3+
import sys
4+
os.system(sys.argv[1])

‎tests/build/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ENV LC_ALL en_US.UTF-8
1010
RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
1111

1212
ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
13+
RUN pyenv install 2.7.12
1314
RUN pyenv install 3.7.3
1415
RUN pyenv global 3.7.3
1516
RUN pyenv rehash
@@ -22,7 +23,8 @@ WORKDIR /panda/boardesp
2223
RUN git clone --recursive https://github.com/pfalcon/esp-open-sdk.git
2324
WORKDIR /panda/boardesp/esp-open-sdk
2425
RUN git checkout 03f5e898a059451ec5f3de30e7feff30455f7ce
25-
RUN CT_ALLOW_BUILD_AS_ROOT_SURE=1 make STANDALONE=y
26+
COPY ./boardesp/python2_make.py /panda/boardesp/esp-open-sdk
27+
RUN python2 python2_make.py "CT_ALLOW_BUILD_AS_ROOT_SURE=1 make STANDALONE=y"
2628

2729
COPY . /panda
2830

0 commit comments

Comments
 (0)