Skip to content

Commit 5f22d0d

Browse files
authored
Use latest debian and add use pyenv to install python 2.7 for the breakpad build (#24)
1 parent a685a93 commit 5f22d0d

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

base/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \
211211
&& apt-get update -y \
212212
&& apt-get install -y --no-install-recommends \
213213
git \
214+
zlib1g-dev \
215+
libssl-dev \
216+
# breakpad's build tools require python2 to be available as python on the path
217+
&& git clone https://github.com/pyenv/pyenv.git .pyenv \
218+
&& export PYENV_ROOT="$(pwd)/.pyenv" \
219+
&& export PATH="$PYENV_ROOT/bin:$PATH" \
220+
&& eval "$(pyenv init --path)" \
221+
&& pyenv install 2.7 \
222+
&& pyenv global 2.7 \
214223
# Fetch and activate depot_tools
215224
&& cd /root \
216225
&& git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git \
@@ -233,7 +242,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \
233242
/tmp/* \
234243
breakpad \
235244
depot_tools \
245+
.pyenv \
236246
&& apt-get autoremove -y \
237247
git \
248+
zlib1g-dev \
249+
libssl-dev \
238250
&& apt-get clean \
239251
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt

toolchain/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Essential cross-compiling build tools for the reMarkable
2-
FROM debian:unstable-20220125-slim
2+
FROM debian:unstable-20230703-slim
33
ARG NGCONFIG="arm-remarkable-linux-gnueabihf"
44
ARG CHOST="arm-linux-gnueabihf"
55

0 commit comments

Comments
 (0)