Skip to content

restore compatibility with armv6 devices (bluenviron/mediamtx#5590) #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aler9 merged 1 commit into from
Mar 20, 2026
+75 −72
Merged

restore compatibility with armv6 devices (bluenviron/mediamtx#5590) #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 53 additions & 50 deletions scripts/base.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,18 @@ FROM $(DEBIAN_BULLSEYE_IMAGE)
# Raspbian libraries and compilers provide arm v6 compatibility.

RUN apt update \
&& apt install -y wget gpg \
&& wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \
&& echo "deb http://archive.raspbian.org/raspbian bullseye main rpi firmware" > /etc/apt/sources.list \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
&& echo "deb http://archive.raspberrypi.org/debian bullseye main" > /etc/apt/sources.list.d/raspi.list \
&& rm -rf /var/lib/apt/lists/*
&& apt install -y wget gpg \
&& wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \
&& echo "deb http://archive.raspbian.org/raspbian bullseye main rpi firmware" > /etc/apt/sources.list \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
&& echo "deb http://archive.raspberrypi.org/debian bullseye main" > /etc/apt/sources.list.d/raspi.list \
&& rm -rf /var/lib/apt/lists/*

RUN apt update && apt install --reinstall -y \
libc6 \
libstdc++6 \
&& rm -rf /var/lib/apt/lists/*
libc6 \
libc-bin \
libstdc++6 \
&& rm -rf /var/lib/apt/lists/*
endef
export DOCKERFILE_BASE_BULLSEYE_32

Expand All @@ -31,10 +32,10 @@ define DOCKERFILE_BASE_BULLSEYE_64
FROM $(DEBIAN_BULLSEYE_IMAGE)

RUN apt update \
&& apt install -y wget gpg \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
&& echo "deb http://archive.raspberrypi.org/debian bullseye main" > /etc/apt/sources.list.d/raspi.list \
&& rm -rf /var/lib/apt/lists/*
&& apt install -y wget gpg \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
&& echo "deb http://archive.raspberrypi.org/debian bullseye main" > /etc/apt/sources.list.d/raspi.list \
&& rm -rf /var/lib/apt/lists/*
endef
export DOCKERFILE_BASE_BULLSEYE_64

Expand All @@ -50,17 +51,18 @@ FROM $(DEBIAN_BOOKWORM_IMAGE)
# Raspbian libraries and compilers provide arm v6 compatibility.

RUN apt update \
&& apt install -y wget gpg \
&& wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \
&& echo "deb http://archive.raspbian.org/raspbian bookworm main rpi firmware" > /etc/apt/sources.list \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
&& echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \
&& rm -rf /var/lib/apt/lists/*
&& apt install -y wget gpg \
&& wget -O- https://archive.raspbian.org/raspbian.public.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspbian.gpg \
&& echo "deb http://archive.raspbian.org/raspbian bookworm main rpi firmware" > /etc/apt/sources.list \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
&& echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \
&& rm -rf /var/lib/apt/lists/*

RUN apt update && apt install --reinstall -y \
libc6 \
libstdc++6 \
&& rm -rf /var/lib/apt/lists/*
libc6 \
libc-bin \
libstdc++6 \
&& rm -rf /var/lib/apt/lists/*
endef
export DOCKERFILE_BASE_BOOKWORM_32

Expand All @@ -71,10 +73,10 @@ define DOCKERFILE_BASE_BOOKWORM_64
FROM $(DEBIAN_BOOKWORM_IMAGE)

RUN apt update \
&& apt install -y wget gpg \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
&& echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \
&& rm -rf /var/lib/apt/lists/*
&& apt install -y wget gpg \
&& wget -O- https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/raspberrypi.gpg \
&& echo "deb http://archive.raspberrypi.org/debian bookworm main" > /etc/apt/sources.list.d/raspi.list \
&& rm -rf /var/lib/apt/lists/*
endef
export DOCKERFILE_BASE_BOOKWORM_64

Expand All @@ -90,25 +92,26 @@ FROM $(DEBIAN_TRIXIE_IMAGE)
# Raspbian libraries and compilers provide arm v6 compatibility.

RUN apt update \
&& apt install -y wget gpg \
&& wget -O /raspbian-archive-keyring.deb \
https://archive.raspbian.org/raspbian/pool/main/r/raspbian-archive-keyring/raspbian-archive-keyring_20120528.4_all.deb \
&& dpkg -i /raspbian-archive-keyring.deb \
&& rm /raspbian-archive-keyring.deb \
&& wget -O /etc/apt/sources.list.d/raspbian.sources \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspbian.sources \
&& sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspbian.sources \
&& wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp \
&& wget -O /etc/apt/sources.list.d/raspi.sources \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspi.sources \
&& sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspi.sources \
&& rm -rf /var/lib/apt/lists/*
&& apt install -y wget gpg \
&& wget -O /raspbian-archive-keyring.deb \
https://archive.raspbian.org/raspbian/pool/main/r/raspbian-archive-keyring/raspbian-archive-keyring_20120528.4_all.deb \
&& dpkg -i /raspbian-archive-keyring.deb \
&& rm /raspbian-archive-keyring.deb \
&& wget -O /etc/apt/sources.list.d/raspbian.sources \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspbian.sources \
&& sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspbian.sources \
&& wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp \
&& wget -O /etc/apt/sources.list.d/raspi.sources \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspi.sources \
&& sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspi.sources \
&& rm -rf /var/lib/apt/lists/*

RUN apt update && apt install --reinstall -y \
libc6 \
libstdc++6 \
&& rm -rf /var/lib/apt/lists/*
libc6 \
libc-bin \
libstdc++6 \
&& rm -rf /var/lib/apt/lists/*
endef
export DOCKERFILE_BASE_TRIXIE_32

Expand All @@ -119,13 +122,13 @@ define DOCKERFILE_BASE_TRIXIE_64
FROM $(DEBIAN_TRIXIE_IMAGE)

RUN apt update \
&& apt install -y wget gpg \
&& wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp \
&& wget -O /etc/apt/sources.list.d/raspi.sources \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspi.sources \
&& sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspi.sources \
&& rm -rf /var/lib/apt/lists/*
&& apt install -y wget gpg \
&& wget -O /usr/share/keyrings/raspberrypi-archive-keyring.pgp \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp \
&& wget -O /etc/apt/sources.list.d/raspi.sources \
https://github.com/RPi-Distro/pi-gen/raw/358f9785089fa9fce397b7c36de2d90a9ae9a50e/stage0/00-configure-apt/files/raspi.sources \
&& sed -i "s/RELEASE/trixie/g" /etc/apt/sources.list.d/raspi.sources \
&& rm -rf /var/lib/apt/lists/*
endef
export DOCKERFILE_BASE_TRIXIE_64

Expand Down
44 changes: 22 additions & 22 deletions scripts/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ build: build_32 build_64
define DOCKERFILE_BUILD_32
FROM base_bullseye_32
RUN apt update && apt install -y --no-install-recommends \
g++ \
xxd \
wget \
git \
cmake \
meson \
pkg-config \
python3-jinja2 \
python3-yaml \
python3-ply
g++ \
xxd \
wget \
git \
cmake \
meson \
pkg-config \
python3-jinja2 \
python3-yaml \
python3-ply
WORKDIR /s
COPY . .
RUN meson setup build && DESTDIR=./prefix ninja -C build install
Expand All @@ -27,18 +27,18 @@ build_32: base_bullseye_32
define DOCKERFILE_BUILD_64
FROM base_bullseye_64
RUN apt update && apt install -y --no-install-recommends \
g++ \
make \
xxd \
wget \
git \
cmake \
meson \
patch \
pkg-config \
python3-jinja2 \
python3-yaml \
python3-ply
g++ \
make \
xxd \
wget \
git \
cmake \
meson \
patch \
pkg-config \
python3-jinja2 \
python3-yaml \
python3-ply
WORKDIR /s
COPY . .
RUN meson setup build && DESTDIR=./prefix ninja -C build install
Expand Down