From a88d43c91bb8fc8473e55b4fbab26977cf785626 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 18 Aug 2019 18:24:17 +0200 Subject: [PATCH] - merged 4.1.0 from PLD --- qemu.spec | 32 +++++++++++++++++++++++++------- x32.patch | 31 ------------------------------- 2 files changed, 25 insertions(+), 38 deletions(-) delete mode 100644 x32.patch diff --git a/qemu.spec b/qemu.spec index e061d29..cf96dfd 100644 --- a/qemu.spec +++ b/qemu.spec @@ -39,12 +39,12 @@ Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 4.0.0 -Release: 2 +Version: 4.1.0 +Release: 1 License: GPL v2 Group: Applications/Emulators Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz -# Source0-md5: 0afeca336fd57ae3d3086ec07f59d708 +# Source0-md5: cdf2b5ca52b9abac9bacb5842fa420f8 # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf # Creates /dev/kvm @@ -59,7 +59,6 @@ Patch1: %{name}-whitelist.patch Patch2: %{name}-user-execve.patch Patch3: %{name}-xattr.patch Patch4: libjpeg-boolean.patch -Patch5: x32.patch URL: http://www.qemu-project.org/ %{?with_gl:BuildRequires: OpenGL-GLX-devel} %{?with_gl:BuildRequires: OpenGL-devel} @@ -89,7 +88,7 @@ BuildRequires: libjpeg-devel %{?with_libnfs:BuildRequires: libnfs-devel >= 1.9.3} BuildRequires: libpng-devel %{?with_rdma:BuildRequires: librdmacm-devel} -%{?with_seccomp:BuildRequires: libseccomp-devel >= 2.2.0} +%{?with_seccomp:BuildRequires: libseccomp-devel >= 2.3.0} BuildRequires: libssh2-devel >= 1.2.8 BuildRequires: libusb-devel >= 1.0.13 BuildRequires: libuuid-devel @@ -135,6 +134,7 @@ BuildRequires: glibc-static BuildRequires: pcre-static BuildRequires: zlib-static %endif +BuildConflicts: libslirp-devel Requires: %{name}-img = %{version}-%{release} Requires: %{name}-system-aarch64 = %{version}-%{release} Requires: %{name}-system-alpha = %{version}-%{release} @@ -168,7 +168,7 @@ Requires: SDL2 \ %endif \ Requires: libfdt >= 1.4.2 \ %if %{with seccomp} \ -Requires: libseccomp >= 2.2.0 \ +Requires: libseccomp >= 2.3.0 \ %endif \ Requires: libusb >= 1.0.13 \ Requires: pixman >= 0.21.8 \ @@ -833,7 +833,6 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 # workaround for conflict with alsa/error.h ln -s ../error.h qapi/error.h @@ -1045,6 +1044,7 @@ fi %{_mandir}/man8/qemu-nbd.8* %dir %{_datadir}/qemu +%dir %{_datadir}/%{name}/firmware %{_datadir}/%{name}/keymaps %{_datadir}/%{name}/trace-events-all @@ -1084,6 +1084,7 @@ fi %{_datadir}/%{name}/slof.bin %{_datadir}/%{name}/spapr-rtas.bin %{_datadir}/%{name}/vgabios.bin +%{_datadir}/%{name}/vgabios-ati.bin %{_datadir}/%{name}/vgabios-bochs-display.bin %{_datadir}/%{name}/vgabios-cirrus.bin %{_datadir}/%{name}/vgabios-qxl.bin @@ -1198,6 +1199,8 @@ fi %files system-aarch64 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-aarch64 +%{_datadir}/%{name}/edk2-aarch64-code.fd +%{_datadir}/%{name}/firmware/60-edk2-aarch64.json %files system-alpha %defattr(644,root,root,755) @@ -1206,6 +1209,9 @@ fi %files system-arm %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-arm +%{_datadir}/%{name}/edk2-arm-code.fd +%{_datadir}/%{name}/edk2-arm-vars.fd +%{_datadir}/%{name}/firmware/60-edk2-arm.json %files system-cris %defattr(644,root,root,755) @@ -1260,10 +1266,13 @@ fi %files system-riscv32 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-riscv32 +%{_datadir}/%{name}/opensbi-riscv32-virt-fw_jump.bin %files system-riscv64 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-riscv64 +%{_datadir}/%{name}/opensbi-riscv64-sifive_u-fw_jump.bin +%{_datadir}/%{name}/opensbi-riscv64-virt-fw_jump.bin %files system-s390x %defattr(644,root,root,755) @@ -1298,6 +1307,15 @@ fi %endif %{_datadir}/%{name}/bios.bin %{_datadir}/%{name}/bios-256k.bin +%{_datadir}/%{name}/edk2-i386-code.fd +%{_datadir}/%{name}/edk2-i386-secure-code.fd +%{_datadir}/%{name}/edk2-i386-vars.fd +%{_datadir}/%{name}/edk2-x86_64-code.fd +%{_datadir}/%{name}/edk2-x86_64-secure-code.fd +%{_datadir}/%{name}/firmware/50-edk2-i386-secure.json +%{_datadir}/%{name}/firmware/50-edk2-x86_64-secure.json +%{_datadir}/%{name}/firmware/60-edk2-i386.json +%{_datadir}/%{name}/firmware/60-edk2-x86_64.json %files system-xtensa %defattr(644,root,root,755) diff --git a/x32.patch b/x32.patch deleted file mode 100644 index e135219..0000000 --- a/x32.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- qemu-2.2.0/configure~ 2015-03-26 19:52:14.000000000 +0100 -+++ qemu-2.2.0/configure 2015-03-26 19:56:34.255072716 +0100 -@@ -1904,7 +1904,7 @@ - libseccomp_minver="2.2.0" - if test "$seccomp" != "no" ; then - case "$cpu" in -- i386|x86_64|mips) -+ i386|x86_64|x32|mips) - ;; - arm|aarch64) - libseccomp_minver="2.2.3" -@@ -6148,7 +6148,7 @@ - - # Mac OS X ships with a broken assembler - roms= --if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ -+if { test "$cpu" = "i386" || test "$cpu" = "x86_64" || test "$cpu" = "x32"; } && \ - test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \ - test "$softmmu" = yes ; then - # Different host OS linkers have different ideas about the name of the ELF ---- qemu-2.6.0/include/qemu/atomic.h~ 2016-07-17 18:37:57.000000000 +0200 -+++ qemu-2.6.0/include/qemu/atomic.h 2016-07-17 18:38:33.485893530 +0200 -@@ -20,7 +20,7 @@ - /* Compiler barrier */ - #define barrier() ({ asm volatile("" ::: "memory"); (void)0; }) - --#ifdef __ATOMIC_RELAXED -+#if defined(__ATOMIC_RELAXED) && !defined(__ILP32__) - /* For C11 atomic ops */ - - /* Manual memory barriers -- 2.44.0