- updated to 9.1.2

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index a2d165fca575736af3b1ed9ca9e3d515ea465602..03acaec16f91e492cebda0ae9e2967e0f3ae3aa1 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,5 +1,6 @@
---- qemu-8.2.4/include/qemu/osdep.h.orig       2024-05-13 21:19:44.000000000 +0200
-+++ qemu-8.2.4/include/qemu/osdep.h    2024-05-28 21:35:11.927464569 +0200
+diff -ur qemu-9.1.2.orig/include/qemu/osdep.h qemu-9.1.2/include/qemu/osdep.h
+--- qemu-9.1.2.orig/include/qemu/osdep.h       2024-12-04 01:19:46.975972698 +0100
++++ qemu-9.1.2/include/qemu/osdep.h    2024-12-04 01:20:49.648954726 +0100
 @@ -27,10 +27,6 @@
  #ifndef QEMU_OSDEP_H
  #define QEMU_OSDEP_H
@@ -9,5 +10,5 @@
 -#endif
 -
  #include "config-host.h"
- #ifdef NEED_CPU_H
+ #ifdef COMPILING_PER_TARGET
  #include CONFIG_TARGET

diff --git a/qemu.spec b/qemu.spec
index b84f3620766638b08a7f1f5a53fca9c4735c6c3d..37eed92b847c079042bc1ee8e6b0db528a730c67 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -46,12 +46,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       9.0.2
+Version:       9.1.2
 Release:       1
 License:       GPL v2, BSD (edk2 firmware files)
 Group:         Applications/Emulators
 Source0:       https://download.qemu.org/%{name}-%{version}.tar.xz
-# Source0-md5: f7f0462262d2571f146c6a8adda33b29
+# Source0-md5: ea4bb735d60ad3392875f7cd48e551af
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm
@@ -200,7 +200,6 @@ Requires:   %{name}-system-hppa = %{version}-%{release}
 Requires:      %{name}-system-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}
-Requires:      %{name}-system-nios2 = %{version}-%{release}
 Requires:      %{name}-system-or1k = %{version}-%{release}
 Requires:      %{name}-system-ppc = %{version}-%{release}
 Requires:      %{name}-system-riscv32 = %{version}-%{release}
@@ -573,25 +572,6 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem MIPS.
 
-%package system-nios2
-Summary:       QEMU system emulator for Nios II
-Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Nios II
-Group:         Applications/Emulators
-Requires:      %{name}-common = %{version}-%{release}
-%systempkg_req
-
-%description system-nios2
-QEMU is a generic and open source processor emulator which achieves a
-good emulation speed by using dynamic translation.
-
-This package provides the system emulator with Nios II CPU.
-
-%description system-nios2 -l pl.UTF-8
-QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
-dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
-
-Ten pakiet zawiera emulator systemu z procesorem Nios II.
-
 %package system-or1k
 Summary:       QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem OpenRISC
@@ -1286,6 +1266,7 @@ fi
 %endif
 %attr(755,root,root) %{_bindir}/qemu-nbd
 %attr(755,root,root) %{_bindir}/qemu-pr-helper
+%attr(755,root,root) %{_bindir}/qemu-vmsr-helper
 %attr(755,root,root) %{_bindir}/qemu-storage-daemon
 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned
@@ -1395,7 +1376,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mips64el
 %attr(755,root,root) %{_bindir}/qemu-mipsn32
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el
-%attr(755,root,root) %{_bindir}/qemu-nios2
 %attr(755,root,root) %{_bindir}/qemu-or1k
 %attr(755,root,root) %{_bindir}/qemu-ppc
 %attr(755,root,root) %{_bindir}/qemu-ppc64
@@ -1434,7 +1414,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mipsel-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el-static
-%attr(755,root,root) %{_bindir}/qemu-nios2-static
 %attr(755,root,root) %{_bindir}/qemu-or1k-static
 %attr(755,root,root) %{_bindir}/qemu-ppc-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64-static
@@ -1503,10 +1482,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-system-mips64
 %attr(755,root,root) %{_bindir}/qemu-system-mips64el
 
-%files system-nios2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/qemu-system-nios2
-
 %files system-or1k
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-or1k
@@ -1537,6 +1512,8 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-riscv64
 %{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.bin
+%{_datadir}/%{name}/edk2-riscv-code.fd
+%{_datadir}/%{name}/edk2-riscv-vars.fd
 
 %files system-rx
 %defattr(644,root,root,755)