Merge pull request #142 from Habbie/unbreak-build-dec2024

fix 3 build problems

.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

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 \
@@ -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"]

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 "$@"