Skip to content

Commit fc7f66d

Browse files
EeemsEeems
authored
Add git and git-lfs by default to toolchain (#44)
* Add git and git-lfs by default to toolchain * Update base to assume git is installed * Assume git is installed for qt * Add missing quote * Add missing quote
1 parent 736fd0c commit fc7f66d

3 files changed

Lines changed: 5 additions & 49 deletions

File tree

‎base/Dockerfile‎

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ FROM $FROM
44

55
# Build libcap 2.66 targeting armhf
66
RUN export DEBIAN_FRONTEND=noninteractive \
7-
# Install build dependencies
8-
&& apt-get update -y \
9-
&& apt-get install -y --no-install-recommends \
10-
git \
117
# Build libcap
128
&& cd /root \
139
&& git clone --depth 1 --branch libcap-2.66 git://git.kernel.org/pub/scm/libs/libcap/libcap.git \
@@ -26,11 +22,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2622
DESTDIR="$SYSROOT" \
2723
&& cd .. \
2824
# Clean up
29-
&& rm -rf libcap \
30-
&& apt-get autoremove -y \
31-
git \
32-
&& apt-get clean \
33-
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
25+
&& rm -rf libcap
3426

3527
# Build util-linux 2.37.4 targeting armhf
3628
RUN export DEBIAN_FRONTEND=noninteractive \
@@ -41,7 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
4133
autopoint \
4234
bison \
4335
gettext \
44-
git \
4536
libtool \
4637
# Build util-linux
4738
&& cd /root \
@@ -60,7 +51,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
6051
autopoint \
6152
bison \
6253
gettext \
63-
git \
6454
libtool \
6555
&& apt-get clean \
6656
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
@@ -71,7 +61,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
7161
&& apt-get update -y \
7262
&& apt-get install -y --no-install-recommends \
7363
gettext \
74-
git \
7564
gperf \
7665
m4 \
7766
rsync \
@@ -97,7 +86,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
9786
# TODO: remove pip packages as well
9887
&& apt-get autoremove -y \
9988
gettext \
100-
git \
10189
gperf \
10290
m4 \
10391
rsync \
@@ -111,7 +99,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
11199
&& apt-get update -y \
112100
&& apt-get install -y --no-install-recommends \
113101
automake \
114-
git \
115102
libtool \
116103
# Build static zlib
117104
&& cd /root \
@@ -135,7 +122,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
135122
&& find "$SYSROOT" -type l,f -name "*.la" -delete \
136123
&& apt-get autoremove -y \
137124
automake \
138-
git \
139125
libtool \
140126
&& apt-get clean \
141127
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
@@ -198,7 +184,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
198184
# Install build dependencies
199185
&& apt-get update -y \
200186
&& apt-get install -y --no-install-recommends \
201-
git \
202187
zlib1g-dev \
203188
libssl-dev \
204189
# breakpad's build tools require python2 to be available as python on the path
@@ -233,7 +218,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
233218
depot_tools \
234219
.pyenv \
235220
&& apt-get autoremove -y \
236-
git \
237221
zlib1g-dev \
238222
libssl-dev \
239223
&& apt-get clean \
@@ -242,10 +226,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
242226
# Build libcap 2.66 targeting aarch64
243227
RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
244228
&& source /opt/x-tools/switch-aarch64.sh \
245-
# Install build dependencies
246-
&& apt-get update -y \
247-
&& apt-get install -y --no-install-recommends \
248-
git \
249229
# Build libcap
250230
&& cd /root \
251231
&& git clone --depth 1 --branch libcap-2.66 git://git.kernel.org/pub/scm/libs/libcap/libcap.git \
@@ -264,11 +244,7 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
264244
DESTDIR="$SYSROOT" \
265245
&& cd .. \
266246
# Clean up
267-
&& rm -rf libcap \
268-
&& apt-get autoremove -y \
269-
git \
270-
&& apt-get clean \
271-
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt'
247+
&& rm -rf libcap'
272248

273249
# Build util-linux 2.37.4 targeting aarch64
274250
RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
@@ -280,7 +256,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
280256
autopoint \
281257
bison \
282258
gettext \
283-
git \
284259
libtool \
285260
# Build util-linux
286261
&& cd /root \
@@ -299,7 +274,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
299274
autopoint \
300275
bison \
301276
gettext \
302-
git \
303277
libtool \
304278
&& apt-get clean \
305279
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt'
@@ -311,7 +285,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
311285
&& apt-get update -y \
312286
&& apt-get install -y --no-install-recommends \
313287
gettext \
314-
git \
315288
gperf \
316289
m4 \
317290
rsync \
@@ -337,7 +310,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
337310
# TODO: remove pip packages as well
338311
&& apt-get autoremove -y \
339312
gettext \
340-
git \
341313
gperf \
342314
m4 \
343315
rsync \
@@ -352,7 +324,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
352324
&& apt-get update -y \
353325
&& apt-get install -y --no-install-recommends \
354326
automake \
355-
git \
356327
libtool \
357328
# Build static zlib
358329
&& cd /root \
@@ -376,7 +347,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
376347
&& find "$SYSROOT" -type l,f -name "*.la" -delete \
377348
&& apt-get autoremove -y \
378349
automake \
379-
git \
380350
libtool \
381351
&& apt-get clean \
382352
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt'
@@ -440,30 +410,21 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
440410
# Build libdrm (imx fork) 2.4.109 targeting aarch64
441411
RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
442412
&& source /opt/x-tools/switch-aarch64.sh \
443-
# Install build dependencies
444-
&& apt-get update -y \
445-
&& apt-get install -y --no-install-recommends \
446-
git \
447413
&& cd /root \
448414
&& git clone --depth 1 --branch libdrm-imx-2.4.109 https://github.com/nxp-imx/libdrm-imx \
449415
&& cd libdrm-imx \
450416
&& meson -Dvivante=true -Dprefix=/usr --cross-file /usr/share/meson/cross/aarch64-remarkable-linux-gnu builddir/ \
451417
&& DESTDIR=$SYSROOT ninja -C builddir/ install \
452418
&& cd .. \
453419
# Clean up
454-
&& rm -rf libdrm-imx \
455-
&& apt-get autoremove -y \
456-
git \
457-
&& apt-get clean \
458-
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt'
420+
&& rm -rf libdrm-imx'
459421

460422
# Build breakpad 0.1 (f88a1aa2af) targeting aarch64
461423
RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
462424
&& source /opt/x-tools/switch-aarch64.sh \
463425
# Install build dependencies
464426
&& apt-get update -y \
465427
&& apt-get install -y --no-install-recommends \
466-
git \
467428
zlib1g-dev \
468429
libssl-dev \
469430
# breakpad's build tools require python2 to be available as python on the path
@@ -498,7 +459,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
498459
depot_tools \
499460
.pyenv \
500461
&& apt-get autoremove -y \
501-
git \
502462
zlib1g-dev \
503463
libssl-dev \
504464
&& apt-get clean \

‎qt/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
99
# Install build dependencies
1010
&& apt-get update -y \
1111
&& apt-get install -y --no-install-recommends \
12-
git \
1312
libudev-dev \
1413
# Build Qt
1514
&& cd /root \
@@ -86,7 +85,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
8685
&& rm -rf qt5-build \
8786
&& find "$SYSROOT" -type l,f -name "*.la" | xargs --no-run-if-empty rm' \
8887
&& apt-get autoremove -y \
89-
git \
9088
&& apt-get clean \
9189
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
9290

‎toolchain/Dockerfile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
1717
g++-11 \
1818
meson \
1919
pkg-config \
20+
git \
21+
git-lfs \
2022
&& apt-get clean \
2123
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt \
2224
# Force use of gcc and g++ 11
@@ -38,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
3840
file \
3941
flex \
4042
gawk \
41-
git \
4243
help2man \
4344
libncurses-dev \
4445
libtool-bin \
@@ -96,7 +97,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
9697
file \
9798
flex \
9899
gawk \
99-
git \
100100
help2man \
101101
libncurses-dev \
102102
libtool-bin \
@@ -112,7 +112,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
112112
&& apt-get update -y \
113113
&& apt-get install -y --no-install-recommends \
114114
automake \
115-
git \
116115
libarchive-dev \
117116
libcurl4-gnutls-dev \
118117
libgpgme-dev \
@@ -134,7 +133,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
134133
&& rm /usr/lib/libopkg.la \
135134
&& apt-get autoremove -y \
136135
automake \
137-
git \
138136
libarchive-dev \
139137
libssl-dev \
140138
libtool-bin \

0 commit comments

Comments
 (0)