From 0aabdfb85369a7d29d3113f1e6fdb204f17730ec Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 29 Oct 2025 16:25:06 -0600 Subject: [PATCH 1/5] Add git and git-lfs by default to toolchain --- toolchain/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile index 4b6583f..581be4b 100644 --- a/toolchain/Dockerfile +++ b/toolchain/Dockerfile @@ -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 @@ -38,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ file \ flex \ gawk \ - git \ help2man \ libncurses-dev \ libtool-bin \ @@ -96,7 +97,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ file \ flex \ gawk \ - git \ help2man \ libncurses-dev \ libtool-bin \ @@ -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 \ @@ -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 \ From 026df4a25d4300f20e2d710f81c26ee26a535289 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 29 Oct 2025 16:28:18 -0600 Subject: [PATCH 2/5] Update base to assume git is installed --- base/Dockerfile | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index d3e13c3..e780d69 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -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 \ @@ -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 \ @@ -41,7 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ autopoint \ bison \ gettext \ - git \ libtool \ # Build util-linux && cd /root \ @@ -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 @@ -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 \ @@ -97,7 +86,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ # TODO: remove pip packages as well && apt-get autoremove -y \ gettext \ - git \ gperf \ m4 \ rsync \ @@ -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 \ @@ -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 @@ -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 @@ -233,7 +218,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ depot_tools \ .pyenv \ && apt-get autoremove -y \ - git \ zlib1g-dev \ libssl-dev \ && apt-get clean \ @@ -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 \ @@ -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 \ @@ -280,7 +256,6 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \ autopoint \ bison \ gettext \ - git \ libtool \ # Build util-linux && cd /root \ @@ -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' @@ -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 \ @@ -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 \ @@ -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 \ @@ -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' @@ -440,10 +410,6 @@ 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 \ @@ -451,11 +417,7 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \ && 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 \ @@ -463,7 +425,6 @@ RUN /bin/bash -c '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 @@ -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 \ From b480ee12b8e8407d58f2da68310b58f3403f6343 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 29 Oct 2025 16:29:16 -0600 Subject: [PATCH 3/5] Assume git is installed for qt --- qt/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/qt/Dockerfile b/qt/Dockerfile index 81b7c1d..569f59a 100644 --- a/qt/Dockerfile +++ b/qt/Dockerfile @@ -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 \ @@ -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 From 8dcbcbf6a9e6597cb1bbf0e953380e97ccd25f8a Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 29 Oct 2025 18:11:48 -0600 Subject: [PATCH 4/5] Add missing quote --- base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile b/base/Dockerfile index e780d69..38a97b2 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -244,7 +244,7 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \ DESTDIR="$SYSROOT" \ && cd .. \ # Clean up - && rm -rf libcap + && rm -rf libcap' # Build util-linux 2.37.4 targeting aarch64 RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \ From b3cc188833460ebd12760e1f5df72989a4773578 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 29 Oct 2025 19:47:01 -0600 Subject: [PATCH 5/5] Add missing quote --- base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile b/base/Dockerfile index 38a97b2..a537410 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -417,7 +417,7 @@ RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \ && DESTDIR=$SYSROOT ninja -C builddir/ install \ && cd .. \ # Clean up - && rm -rf libdrm-imx + && rm -rf libdrm-imx' # Build breakpad 0.1 (f88a1aa2af) targeting aarch64 RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive \