From 023e4d2ab7da346e238b8c108dec88afada97706 Mon Sep 17 00:00:00 2001 From: Xianglai Li Date: Sat, 30 Nov 2024 17:34:57 +0800 Subject: [PATCH] [Bug] Remove loongarch qemu's dependency on the seavgabios package to #bug12174 Remove loongarch qemu's dependency on the seavgabios package. project: TC2024110201 Signed-off-by: Xianglai Li --- qemu.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/qemu.spec b/qemu.spec index 1ea388b..13f07bf 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,4 +1,4 @@ -%define anolis_release 24 +%define anolis_release 25 %bcond_with check %global all_system_emu_support 0 @@ -1192,7 +1192,6 @@ Requires: %{name}-system-loongarch64-core = %{EVR} This package provides the QEMU system emulator for Loongson boards. %package system-loongarch64-core -Requires: seavgabios-bin %if %{have_edk2} Requires: edk2-loongarch64 %endif @@ -1692,8 +1691,10 @@ rm -rf %{buildroot}%{qemudocdir}/specs # Provided by package ipxe rm -rf %{buildroot}%{_datadir}/%{name}/pxe*rom rm -rf %{buildroot}%{_datadir}/%{name}/efi*rom +%ifnarch loongarch64 # Provided by package seavgabios rm -rf %{buildroot}%{_datadir}/%{name}/vgabios*bin +%endif # Provided by package seabios rm -rf %{buildroot}%{_datadir}/%{name}/bios*.bin # Provided by package sgabios @@ -1910,6 +1911,19 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_datadir}/%{name}/pvh.bin %{_datadir}/%{name}/qboot.rom +%ifarch loongarch64 +# Provided by package seavgabios +%{_datadir}/%{name}/vgabios-ati.bin +%{_datadir}/%{name}/vgabios-bochs-display.bin +%{_datadir}/%{name}/vgabios-cirrus.bin +%{_datadir}/%{name}/vgabios-qxl.bin +%{_datadir}/%{name}/vgabios-ramfb.bin +%{_datadir}/%{name}/vgabios-stdvga.bin +%{_datadir}/%{name}/vgabios-virtio.bin +%{_datadir}/%{name}/vgabios-vmware.bin +%{_datadir}/%{name}/vgabios.bin +%endif + %files tests %{testsdir} @@ -2097,6 +2111,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Sat Nov 30 2024 Xianglai Li - 2:8.2.0-25 +- Remove loongarch qemu's dependency on the seavgabios package. + * Wed Nov 27 2024 Xianglai Li - 2:8.2.0-24 - Enable spice for loongarch64. -- Gitee