workflow: fix broken raspi armhf build

ayufan · Jun 1, 2023 · baffbad · baffbad
1 parent 9da4e89
commit baffbad
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.github/ci/Dockerfile b/.github/ci/Dockerfile
@@ -2,22 +2,24 @@ ARG DOCKER_ARCH
 ARG DEBIAN_VERSION
 FROM ${DOCKER_ARCH}debian:${DEBIAN_VERSION} as build_env
 
-# Default packages
-RUN apt-get -y update && apt-get -y install gnupg2 build-essential xxd cmake ccache git-core pkg-config \
-  libavformat-dev libavutil-dev libavcodec-dev libssl-dev v4l-utils
-RUN apt-get -y install debhelper
+RUN apt-get -y update && apt-get -y install gnupg2
 
-# Add RPI packages
+# Add RPI packages (the whole base system, since RPI ships its own GCC)
 ARG DEBIAN_VERSION
 ARG BUILD_TYPE="generic"
 RUN [ "$BUILD_TYPE" != "raspi" ] || \
   ( \
+    ( [ "$(dpkg --print-architecture)" != "armhf" ] || echo "deb http://raspbian.raspberrypi.org/raspbian/ $DEBIAN_VERSION main contrib non-free rpi" > /etc/apt/sources.list ) && \
     echo "deb http://archive.raspberrypi.org/debian/ $DEBIAN_VERSION main" > /etc/apt/sources.list.d/raspi.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 82B129927FA3303E && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9165938D90FDDD2E 82B129927FA3303E && \
     apt-get -y update && \
     apt-get -y install libcamera-dev liblivemedia-dev \
   )
 
+# Default packages
+RUN apt-get -y install build-essential xxd cmake ccache git-core pkg-config \
+  libavformat-dev libavutil-dev libavcodec-dev libssl-dev v4l-utils debhelper
+
 FROM build_env as build
 ADD / /src
 WORKDIR /src