From 1812e4d81d9d9e724c939bc6b15866d8e2b7843c Mon Sep 17 00:00:00 2001 From: SiliconExarch Date: Sun, 27 Jul 2025 01:15:38 +0100 Subject: [PATCH] Update dockerfiles to use Debian Bullseye This fixes the build failure due to /usr/include/linux/swab.h See qemu commit b5d621f for more information --- magiclantern/docker_builder/dockerfile_2_5_0 | 6 ++---- magiclantern/docker_builder/dockerfile_4_2_1 | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/magiclantern/docker_builder/dockerfile_2_5_0 b/magiclantern/docker_builder/dockerfile_2_5_0 index 867e613a91..d498ebaccb 100644 --- a/magiclantern/docker_builder/dockerfile_2_5_0 +++ b/magiclantern/docker_builder/dockerfile_2_5_0 @@ -1,6 +1,4 @@ -FROM debian:stretch-slim -# NB when updating from Stretch, apt-get needs -# to use python2, not python +FROM debian:bullseye-slim LABEL description="Magiclantern qemu-eos builder" # clean is not needed with official Debian images, @@ -11,7 +9,7 @@ LABEL description="Magiclantern qemu-eos builder" RUN apt-get update && \ apt-get install -qy --no-install-recommends \ build-essential \ -python \ +python2 \ wget \ unzip \ pkg-config \ diff --git a/magiclantern/docker_builder/dockerfile_4_2_1 b/magiclantern/docker_builder/dockerfile_4_2_1 index 5e415eaf54..558a883b5e 100644 --- a/magiclantern/docker_builder/dockerfile_4_2_1 +++ b/magiclantern/docker_builder/dockerfile_4_2_1 @@ -1,5 +1,4 @@ -#FROM debian:bullseye-slim -FROM debian:stretch-slim +FROM debian:bullseye-slim LABEL description="Magiclantern qemu-eos builder" # clean is not needed with official Debian images,