jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workflow: fix broken raspi armhf build

Browse Source
This commit is contained in:
Kamil Trzcinski 2023-06-01 16:39:55 +00:00
parent 9da4e89403
commit baffbad1cf
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/ci/Dockerfile vendored
View File

@ -2,22 +2,24 @@ ARG DOCKER_ARCH
ARG DEBIAN_VERSION ARG DEBIAN_VERSION
FROM ${DOCKER_ARCH}debian:${DEBIAN_VERSION} as build_env FROM ${DOCKER_ARCH}debian:${DEBIAN_VERSION} as build_env
# Default packages RUN apt-get -y update && apt-get -y install gnupg2
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
# Add RPI packages # Add RPI packages (the whole base system, since RPI ships its own GCC)
ARG DEBIAN_VERSION ARG DEBIAN_VERSION
ARG BUILD_TYPE="generic" ARG BUILD_TYPE="generic"
RUN [ "$BUILD_TYPE" != "raspi" ] || \ 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 && \ 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 update && \
apt-get -y install libcamera-dev liblivemedia-dev \ 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 FROM build_env as build
ADD / /src ADD / /src
WORKDIR /src WORKDIR /src