[rpms/os-autoinst] rawhide: Backport PR #2953 to handle removal of linuxboot.bin in qemu 11

[Adam Williamson <awilliam@redhat.com>]

A new commit has been pushed.

Repo   : rpms/os-autoinst
Branch : rawhide
Commit : 97856d314f6f7ab88630bddbc39768916e5c22fe
Author : Adam Williamson <awilliam@redhat.com>
Date   : 2026-06-01T14:37:23-07:00
Stats  : +45/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/os-autoinst/c/97856d314f6f7ab88630bddbc39768916e5c22fe?branch=rawhide

Log:
Backport PR #2953 to handle removal of linuxboot.bin in qemu 11

---
diff --git a/0001-fix-test-use-linuxboot_dma.bin-in-18-backend-qemu.t.patch b/0001-fix-test-use-linuxboot_dma.bin-in-18-backend-qemu.t.patch
new file mode 100644
index 0000000..864e0a9
--- /dev/null
+++ b/0001-fix-test-use-linuxboot_dma.bin-in-18-backend-qemu.t.patch
@@ -0,0 +1,42 @@
+From 18c0610e5c2af1d7b90ea7b02e496290d8f400ff Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 1 Jun 2026 14:16:29 -0700
+Subject: [PATCH] fix(test): use linuxboot_dma.bin in 18-backend-qemu.t
+
+linuxboot.bin is apparently a legacy implementation and has been
+removed in qemu 11:
+https://lists.endsoftwarepatents.org/archive/html/qemu-devel/2025-12/msg00243.html
+
+linuxboot_dma.bin should be present in all qemu versions we care
+about.
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ t/18-backend-qemu.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/18-backend-qemu.t b/t/18-backend-qemu.t
+index de45ecfa..6643d2ae 100755
+--- a/t/18-backend-qemu.t
++++ b/t/18-backend-qemu.t
+@@ -685,7 +685,7 @@ subtest 'special cases when starting QEMU' => sub {
+     # set certain variables to test special handling for them that is not otherwise tested
+     $bmwqemu::topdir = "$Bin/..";    # for dmi data
+     $bmwqemu::vars{ARCH} = 'x86_64';
+-    $bmwqemu::vars{KERNEL} = 'linuxboot.bin';
++    $bmwqemu::vars{KERNEL} = 'linuxboot_dma.bin';
+     $bmwqemu::vars{LAPTOP} = '1';
+     $bmwqemu::vars{BOOT_HDD_IMAGE} = 1;
+     $bmwqemu::vars{MULTIPATH} = 1;
+@@ -713,7 +713,7 @@ subtest 'special cases when starting QEMU' => sub {
+     my @invoked_cmds;
+     $backend_mock->redefine(runcmd => sub (@cmd) { push @invoked_cmds, join ' ', @cmd });
+     combined_like { $backend->start_qemu } qr{.*slirpvde --dhcp -s ./vde.ctl --port 87 started with pid 1.*not starting CPU}s, 'slirpvde started, DELAYED_START logged';
+-    like $bmwqemu::vars{KERNEL}, qr{/.*/linuxboot\.bin}, 'KERNEL set to absolute location';
++    like $bmwqemu::vars{KERNEL}, qr{/.*/linuxboot_dma\.bin}, 'KERNEL set to absolute location';
+     is $bmwqemu::vars{LAPTOP}, 'hp_elitebook_820g1', 'default laptop model assigned for LAPTOP=1';
+     is $bmwqemu::vars{BOOTFROM}, 'c', 'BOOTFROM defaults to "c" for BOOT_HDD_IMAGE=1';
+     is $bmwqemu::vars{HDDMODEL}, 'scsi-hd', 'HDDMODEL set for MULTIPATH=1';
+-- 
+2.54.0
+

diff --git a/os-autoinst.spec b/os-autoinst.spec
index f6248fc..8034169 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -44,6 +44,9 @@ Source0:        https://github.com/%{github_owner}/%{github_name}/archive/%{gith
 # Type command and "marker string" together on the serial console in
 # script_run to avoid weird bug where we get extra chars between them
 Patch:          0001-script_run-type-command-and-marker-together-on-seria.patch
+# https://github.com/os-autoinst/os-autoinst/pull/2953
+# Adjust tests for removal of linuxboot.bin in qemu 11
+Patch:          0001-fix-test-use-linuxboot_dma.bin-in-18-backend-qemu.t.patch
 
 # on SUSE this is conditional, for us it doesn't have to be but we
 # still use a macro just to keep build_requires similar for ease of