From 5b01a5f00645f3fc63bb8ad6348bfaee16dd1655 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter@7bits.nl>
Date: Mon, 2 Dec 2024 20:33:32 +0100
Subject: [PATCH 1/3] armel build: use FROM --platform

looks like Debian has set better manifest platform values, which
breaks our previous FROM usage (which was always wrong)
---
 scripts/build-targets/Dockerfile.armel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-targets/Dockerfile.armel b/scripts/build-targets/Dockerfile.armel
index 29329dd..c6ae998 100644
--- a/scripts/build-targets/Dockerfile.armel
+++ b/scripts/build-targets/Dockerfile.armel
@@ -1,4 +1,4 @@
-FROM arm32v5/debian:bookworm
+FROM --platform=linux/arm/v5 debian:bookworm
 RUN apt-get update
 RUN apt-get -yy install \
     build-essential \

From dbe93fa00fa29a0b56bf78b6e4f8b44be495c365 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter@7bits.nl>
Date: Mon, 2 Dec 2024 20:21:26 +0100
Subject: [PATCH 2/3] remove pre-installed cmake from github ubuntu runner
 image

---
 .github/workflows/main.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc259d6..90c1e85 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,6 +14,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+      # https://github.com/mesonbuild/meson/issues/13888 - CMake 3.31.0 causes breakage with cmake module due to --dependency-file
+      # https://github.com/actions/runner-images/releases/tag/ubuntu24%2F20241112.1 - upgrades /usr/local/bin/cmake from 3.30.5 to 3.31.0
+      - name: Remove pre-installed cmake
+        run: sudo rm -f /usr/local/bin/cmake
       - name: Update apt indexes
         run: sudo apt-get update
       - name: Install various apt dependencies

From d8bf655ab734d616c0a105c391cdd92c4260568b Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter@7bits.nl>
Date: Mon, 21 Oct 2024 23:25:52 +0200
Subject: [PATCH 3/3] make ^C work on these runs

this looks bigger than it needs to because the simple fix (add -t to docker run) breaks CI runs
---
 scripts/build-targets/Dockerfile.armel | 6 +++++-
 scripts/build-targets/run              | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/build-targets/Dockerfile.armel b/scripts/build-targets/Dockerfile.armel
index c6ae998..7875dc2 100644
--- a/scripts/build-targets/Dockerfile.armel
+++ b/scripts/build-targets/Dockerfile.armel
@@ -9,6 +9,10 @@ RUN apt-get -yy install \
     pkg-config \
     libssl-dev \
     python3-pip \
-    xxd
+    xxd \
+    tini
 RUN pip install --break-system-packages meson
 RUN git config --global --add safe.directory '*'  # this makes meson's vcs_tag() work
+ENV PYTHONUNBUFFERED=1
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/bin/sh"]
diff --git a/scripts/build-targets/run b/scripts/build-targets/run
index 9d755aa..2cb6920 100755
--- a/scripts/build-targets/run
+++ b/scripts/build-targets/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 TARGET=$1
 shift
-docker run -v $(pwd):$(pwd) -w $(pwd) --rm voorkant-builder:$TARGET "$@"
+docker run -i -v $(pwd):$(pwd) -w $(pwd) --rm voorkant-builder:$TARGET "$@"