Skip to content

Add git and git-lfs by default to toolchain #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Eeems merged 5 commits into from
Oct 30, 2025
Merged

Add git and git-lfs by default to toolchain #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0aabdfb
Add git and git-lfs by default to toolchain
Eeems Oct 29, 2025
026df4a
Update base to assume git is installed
Eeems Oct 29, 2025
b480ee1
Assume git is installed for qt
Eeems Oct 29, 2025
8dcbcbf
Add missing quote
Eeems Oct 30, 2025
b3cc188
Add missing quote
Eeems Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 3 additions & 43 deletions base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ FROM $FROM

# Build libcap 2.66 targeting armhf
RUN export DEBIAN_FRONTEND=noninteractive \
# Install build dependencies
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
git \
# Build libcap
&& cd /root \
&& git clone --depth 1 --branch libcap-2.66 git://git.kernel.org/pub/scm/libs/libcap/libcap.git \
Expand All @@ -26,11 +22,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
DESTDIR="$SYSROOT" \
&& cd .. \
# Clean up
&& rm -rf libcap \
&& apt-get autoremove -y \
git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
&& rm -rf libcap

# Build util-linux 2.37.4 targeting armhf
RUN export DEBIAN_FRONTEND=noninteractive \
Expand All @@ -41,7 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
autopoint \
bison \
gettext \
git \
libtool \
# Build util-linux
&& cd /root \
Expand All @@ -60,7 +51,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
autopoint \
bison \
gettext \
git \
libtool \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
Expand All @@ -71,7 +61,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
gettext \
git \
gperf \
m4 \
rsync \
Expand All @@ -97,7 +86,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
# TODO: remove pip packages as well
&& apt-get autoremove -y \
gettext \
git \
gperf \
m4 \
rsync \
Expand All @@ -111,7 +99,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
automake \
git \
libtool \
# Build static zlib
&& cd /root \
Expand All @@ -135,7 +122,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& find "$SYSROOT" -type l,f -name "*.la" -delete \
&& apt-get autoremove -y \
automake \
git \
libtool \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
Expand Down Expand Up @@ -198,7 +184,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
# Install build dependencies
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
git \
zlib1g-dev \
libssl-dev \
# breakpad's build tools require python2 to be available as python on the path
Expand Down Expand Up @@ -233,7 +218,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
depot_tools \
.pyenv \
&& apt-get autoremove -y \
git \
zlib1g-dev \
libssl-dev \
&& apt-get clean \
Expand All @@ -242,10 +226,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
# Build libcap 2.66 targeting aarch64
RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
&& source /opt/x-tools/switch-aarch64.sh \
# Install build dependencies
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
git \
# Build libcap
&& cd /root \
&& git clone --depth 1 --branch libcap-2.66 git://git.kernel.org/pub/scm/libs/libcap/libcap.git \
Expand All @@ -264,11 +244,7 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
DESTDIR="$SYSROOT" \
&& cd .. \
# Clean up
&& rm -rf libcap \
&& apt-get autoremove -y \
git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt'
&& rm -rf libcap'

# Build util-linux 2.37.4 targeting aarch64
RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
Expand All @@ -280,7 +256,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
autopoint \
bison \
gettext \
git \
libtool \
# Build util-linux
&& cd /root \
Expand All @@ -299,7 +274,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
autopoint \
bison \
gettext \
git \
libtool \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt'
Expand All @@ -311,7 +285,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
gettext \
git \
gperf \
m4 \
rsync \
Expand All @@ -337,7 +310,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
# TODO: remove pip packages as well
&& apt-get autoremove -y \
gettext \
git \
gperf \
m4 \
rsync \
Expand All @@ -352,7 +324,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
automake \
git \
libtool \
# Build static zlib
&& cd /root \
Expand All @@ -376,7 +347,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
&& find "$SYSROOT" -type l,f -name "*.la" -delete \
&& apt-get autoremove -y \
automake \
git \
libtool \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt'
Expand Down Expand Up @@ -440,30 +410,21 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
# Build libdrm (imx fork) 2.4.109 targeting aarch64
RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
&& source /opt/x-tools/switch-aarch64.sh \
# Install build dependencies
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
git \
&& cd /root \
&& git clone --depth 1 --branch libdrm-imx-2.4.109 https://github.com/nxp-imx/libdrm-imx \
&& cd libdrm-imx \
&& meson -Dvivante=true -Dprefix=/usr --cross-file /usr/share/meson/cross/aarch64-remarkable-linux-gnu builddir/ \
&& DESTDIR=$SYSROOT ninja -C builddir/ install \
&& cd .. \
# Clean up
&& rm -rf libdrm-imx \
&& apt-get autoremove -y \
git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt'
&& rm -rf libdrm-imx'

# Build breakpad 0.1 (f88a1aa2af) targeting aarch64
RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
&& source /opt/x-tools/switch-aarch64.sh \
# Install build dependencies
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
git \
zlib1g-dev \
libssl-dev \
# breakpad's build tools require python2 to be available as python on the path
Expand Down Expand Up @@ -498,7 +459,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \
depot_tools \
.pyenv \
&& apt-get autoremove -y \
git \
zlib1g-dev \
libssl-dev \
&& apt-get clean \
Expand Down
2 changes: 0 additions & 2 deletions qt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
# Install build dependencies
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
git \
libudev-dev \
# Build Qt
&& cd /root \
Expand Down Expand Up @@ -86,7 +85,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& rm -rf qt5-build \
&& find "$SYSROOT" -type l,f -name "*.la" | xargs --no-run-if-empty rm' \
&& apt-get autoremove -y \
git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt

6 changes: 2 additions & 4 deletions toolchain/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
g++-11 \
meson \
pkg-config \
git \
git-lfs \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt \
# Force use of gcc and g++ 11
Expand All @@ -38,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
file \
flex \
gawk \
git \
help2man \
libncurses-dev \
libtool-bin \
Expand Down Expand Up @@ -96,7 +97,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
file \
flex \
gawk \
git \
help2man \
libncurses-dev \
libtool-bin \
Expand All @@ -112,7 +112,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
automake \
git \
libarchive-dev \
libcurl4-gnutls-dev \
libgpgme-dev \
Expand All @@ -134,7 +133,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& rm /usr/lib/libopkg.la \
&& apt-get autoremove -y \
automake \
git \
libarchive-dev \
libssl-dev \
libtool-bin \
Expand Down