Hi everyone,
On 2025-06-01 18:45, Jochen Sprickerhof wrote:
> Package: release.debian.org
> Severity: normal
> X-Debbugs-Cc: sbu...@packages.debian.org
> Control: affects -1 + src:sbuild
> User: release.debian....@packages.debian.org
> Usertags: unblock
> this is a pre approval request for an sbuild upload.
I also would have an sbuild fix that I'd like to see in trixie. Patch
attached. The fix is quite simple, it fixes a boot issue in sbuild-qemu
for ARM EFI boot caused by erroneous code duplication.
I'd provide a debdiff but I guess how it looks will depend on how many
of the changes Jochen and I propose you approve.
(Sorry if this is a bit confusing, but I only maintain a very small
subsystem of sbuild.)
Best,
Christian
From f0e11c5af25dac88c749a57b9a259d49e454c234 Mon Sep 17 00:00:00 2001
From: Christian Kastner <c...@kvr.at>
Date: Fri, 30 May 2025 16:11:50 +0200
Subject: [PATCH] sbuild-qemu-boot: Drop duplicated EFI loading
This was accidentally introduced with the new --boot option.
Closes: #1106862
---
bin/sbuild-qemu-boot | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/bin/sbuild-qemu-boot b/bin/sbuild-qemu-boot
index 7a411e09..b87d99d5 100755
--- a/bin/sbuild-qemu-boot
+++ b/bin/sbuild-qemu-boot
@@ -107,12 +107,7 @@ def get_qemu_base_args(image, guest_arch=None, boot="auto"):
if host_arch == 'ppc64el':
argv.append('-enable-kvm')
elif guest_arch == 'arm64':
- argv = [
- 'qemu-system-aarch64',
- '-machine', 'virt',
- '-drive', 'if=pflash,format=raw,unit=0,read-only=on,'
- 'file=/usr/share/AAVMF/AAVMF_CODE.fd',
- ]
+ argv = ['qemu-system-aarch64', '-machine', 'virt']
if host_arch == 'arm64':
argv.extend(['-cpu', 'host', '-enable-kvm'])
else:
@@ -125,12 +120,7 @@ def get_qemu_base_args(image, guest_arch=None, boot="auto"):
'-enable-kvm'
]
else:
- argv = ['qemu-system-arm']
- argv.extend([
- '-machine', 'virt',
- '-drive', 'if=pflash,format=raw,unit=0,read-only=on,'
- 'file=/usr/share/AAVMF/AAVMF32_CODE.fd',
- ])
+ argv = ['qemu-system-arm', '-machine', 'virt']
if boot == "auto":
match guest_arch:
--
2.39.5
