From a7227abf252f9855844a9de5698da117e6e6681f Mon Sep 17 00:00:00 2001
From: Christopher Obbard <christopher.obbard@linaro.org>
Date: Mon, 18 Nov 2024 17:27:45 +0000
Subject: [PATCH 1/3] Revert "docker: Manually register binfmts"

This reverts commit 306d2ea194ec5211a289dce69b805d14c75af167.
---
 docker/Dockerfile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fa13b8ef..fe1c1ea6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -115,12 +115,6 @@ RUN apt-get update && \
         arch-install-scripts && \
     rm -rf /var/lib/apt/lists/*
 
-# debian's qemu-user-static package no longer registers binfmts
-# if running inside a virtualmachine; dockerhub builds are inside a vm
-RUN for arch in aarch64 alpha arm armeb cris hexagon hppa m68k microblaze mips mips64 mips64el mipsel mipsn32 mipsn32el ppc ppc64 ppc64le riscv32 riscv64 s390x sh4 sh4eb sparc sparc32plus sparc64 xtensa xtensaeb; do \
-      update-binfmts --import qemu-$arch; \
-    done
-
 COPY --from=builder $GOPATH/bin/debos /usr/local/bin/debos
 
 # Install the latest archlinux-keyring, since the one in Debian is bound

From a7f657930b91f76d60a75f55543fa9893a3fd92b Mon Sep 17 00:00:00 2001
From: Christopher Obbard <christopher.obbard@linaro.org>
Date: Mon, 18 Nov 2024 17:29:58 +0000
Subject: [PATCH 2/3] docker: install qemu-user-static from backports

Seems that cross-arch Python scripts are failing inside fakemachine
due to qemu-user issue. Install latest qemu from backports to work
around this issue.

Fixes: https://github.com/go-debos/debos/issues/518
Signed-off-by: Christopher Obbard <christopher.obbard@linaro.org>
---
 docker/Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fe1c1ea6..8053f958 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -98,7 +98,6 @@ RUN apt-get update && \
         openssh-client \
         parted \
         pkg-config \
-        qemu-user-static \
         qemu-utils \
         rsync \
         systemd \
@@ -115,6 +114,12 @@ RUN apt-get update && \
         arch-install-scripts && \
     rm -rf /var/lib/apt/lists/*
 
+RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/bookworm-backports.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends -t bookworm-backports \
+        qemu-user-static && \
+    rm -rf /var/lib/apt/lists/*
+
 COPY --from=builder $GOPATH/bin/debos /usr/local/bin/debos
 
 # Install the latest archlinux-keyring, since the one in Debian is bound

From 0b3a472fea92326bdf673e5dfc07b7f5f9ef489b Mon Sep 17 00:00:00 2001
From: Christopher Obbard <christopher.obbard@linaro.org>
Date: Mon, 18 Nov 2024 18:29:40 +0000
Subject: [PATCH 3/3] tests: upgrade debian test to bookworm

Since we're testing under a bookworm environment, build a bookworm test
image.

Signed-off-by: Christopher Obbard <christopher.obbard@linaro.org>
---
 tests/debian/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/debian/test.yaml b/tests/debian/test.yaml
index bf4adb2a..37ddb08e 100644
--- a/tests/debian/test.yaml
+++ b/tests/debian/test.yaml
@@ -4,7 +4,7 @@ architecture: {{$architecture}}
 
 actions:
   - action: debootstrap
-    suite: bullseye
+    suite: bookworm
     variant: minbase
     merged-usr: true