From b5882bc56eb5e4c1f8d40ea0e877fe19ad5f4fb4 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 6 Oct 2022 18:52:42 +0200 Subject: [PATCH] - updated to 7.1.0 - updated cflags,xattr patches - removed obsolete x32 patch --- qemu-cflags.patch | 21 +++++++++++---------- qemu-xattr.patch | 9 ++++----- qemu.spec | 22 +++++++++++++--------- x32.patch | 11 ----------- 4 files changed, 28 insertions(+), 35 deletions(-) delete mode 100644 x32.patch diff --git a/qemu-cflags.patch b/qemu-cflags.patch index b1e4ead..25b6cc1 100644 --- a/qemu-cflags.patch +++ b/qemu-cflags.patch @@ -1,12 +1,13 @@ ---- qemu-5.2.0/configure.orig 2021-03-09 22:06:14.087491054 +0100 -+++ qemu-5.2.0/configure 2021-03-09 22:07:10.121515560 +0100 -@@ -5666,9 +5666,6 @@ +--- qemu-7.1.0/configure.orig 2022-10-05 06:29:01.214549869 +0200 ++++ qemu-7.1.0/configure 2022-10-05 16:30:40.352312168 +0200 +@@ -2246,10 +2246,6 @@ esac - if test "$gcov" = "yes" ; then - : --elif test "$fortify_source" = "yes" ; then -- QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" -- debug=no - fi + write_c_skeleton - case "$ARCH" in +-if test "$fortify_source" = "yes" ; then +- QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" +-fi +- + if test "$have_asan" = "yes"; then + QEMU_CFLAGS="-fsanitize=address $QEMU_CFLAGS" + QEMU_LDFLAGS="-fsanitize=address $QEMU_LDFLAGS" diff --git a/qemu-xattr.patch b/qemu-xattr.patch index edf27c9..6f824d0 100644 --- a/qemu-xattr.patch +++ b/qemu-xattr.patch @@ -3,8 +3,8 @@ When including both, the latter must be included first. Move "qemu-xattr.h" (which includes to the front, before (which includes . ---- qemu-1.7.1/fsdev/virtfs-proxy-helper.c.orig 2014-03-25 15:01:10.000000000 +0100 -+++ qemu-1.7.1/fsdev/virtfs-proxy-helper.c 2014-04-03 02:55:41.115547990 +0200 +--- qemu-7.1.0/fsdev/virtfs-proxy-helper.c.orig 2022-08-30 18:41:57.000000000 +0200 ++++ qemu-7.1.0/fsdev/virtfs-proxy-helper.c 2022-10-05 16:48:32.493170549 +0200 @@ -10,6 +10,7 @@ */ @@ -13,12 +13,11 @@ before (which includes . #include #include #include -@@ -23,7 +24,6 @@ +@@ -22,7 +23,6 @@ + #endif #include - #include "qemu-common.h" #include "qemu/sockets.h" -#include "qemu/xattr.h" #include "9p-iov-marshal.h" #include "hw/9pfs/9p-proxy.h" #include "fsdev/9p-iov-marshal.h" - diff --git a/qemu.spec b/qemu.spec index 0d6f498..26f6f48 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,4 +1,5 @@ # TODO: +# canokey (BR: canokey-qemu.pc, https://github.com/canokeys/canokey-qemu) # plugins? (probes) # # Conditional build: @@ -42,12 +43,12 @@ Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 7.0.0 +Version: 7.1.0 Release: 1 License: GPL v2, BSD (edk2 firmware files) Group: Applications/Emulators Source0: https://download.qemu.org/%{name}-%{version}.tar.xz -# Source0-md5: bfb5b09a0d1f887c8c42a6d5f26971ab +# Source0-md5: 3be5458a9171b4ec5220c65d5d52bdcf # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf # Creates /dev/kvm @@ -69,7 +70,6 @@ Patch0: %{name}-cflags.patch Patch1: %{name}-user-execve.patch Patch2: %{name}-xattr.patch Patch3: libjpeg-boolean.patch -Patch4: x32.patch Patch5: %{name}-u2f-emu.patch Patch6: %{name}-linux-mount.patch URL: https://www.qemu.org/ @@ -109,12 +109,12 @@ BuildRequires: libfuse3-devel >= 3.8 %{?with_rdma:BuildRequires: libibumad-devel} BuildRequires: libjpeg-devel %{?with_libnfs:BuildRequires: libnfs-devel >= 1.9.3} -BuildRequires: libpng-devel +BuildRequires: libpng-devel >= 2:1.6.34 %{?with_rdma:BuildRequires: librdmacm-devel} %{?with_seccomp:BuildRequires: libseccomp-devel >= 2.3.0} BuildRequires: libselinux-devel BuildRequires: libssh-devel >= 0.8.7 -BuildRequires: libslirp-devel >= 4.0.0 +BuildRequires: libslirp-devel >= 4.1.0 # for tests only #BuildRequires: libtasn1-devel BuildRequires: libu2f-emu-devel @@ -215,10 +215,12 @@ Requires: daxctl-libs >= 57 \ Requires: libfdt >= 1.5.1 \ Requires: libfuse3 >= 3.8 \ %{?with_iscsi:Requires: libiscsi >= 1.9.0} \ +Requires: libpng >= 2:1.6.34 \ %if %{with seccomp} \ Requires: libseccomp >= 2.3.0 \ %endif \ -Requires: libslirp >= 4.0.0 \ +Requires: libslirp >= 4.1.0 \ +Requires: liburing >= 0.3 \ Requires: libusb >= 1.0.22 \ Requires: pixman >= 0.21.8 \ %if %{with spice} \ @@ -797,6 +799,7 @@ Summary(pl.UTF-8): Agent gościa QEMU Group: Daemons Requires(post,preun,postun): systemd-units >= 38 Requires: glib2 >= 1:2.64 +Requires: liburing >= 0.3 Requires: systemd-units >= 38 Obsoletes: qemu-kvm-guest-agent < 2 Conflicts: SysVinit < 2.96-2 @@ -974,7 +977,6 @@ Sondy systemtap/dtrace dla QEMU. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -1023,7 +1025,7 @@ build dynamic \ --enable-attr \ %{__enable_disable brlapi} \ --enable-cap-ng \ - --enable-capstone=system \ + --enable-capstone \ --enable-curl \ --enable-curses \ --enable-docs \ @@ -1052,7 +1054,6 @@ build dynamic \ %{__enable_disable virgl virglrenderer} \ --enable-virtfs \ --enable-vnc-jpeg \ - --enable-vnc-png \ --enable-vnc-sasl \ %{!?with_vte:--disable-vte} \ %{__enable_disable xen} \ @@ -1415,6 +1416,7 @@ fi %attr(755,root,root) %{_bindir}/qemu-hppa %attr(755,root,root) %{_bindir}/qemu-i386 %attr(755,root,root) %{_bindir}/qemu-io +%attr(755,root,root) %{_bindir}/qemu-loongarch64 %attr(755,root,root) %{_bindir}/qemu-m68k %attr(755,root,root) %{_bindir}/qemu-microblaze %attr(755,root,root) %{_bindir}/qemu-microblazeel @@ -1454,6 +1456,7 @@ fi %attr(755,root,root) %{_bindir}/qemu-hexagon-static %attr(755,root,root) %{_bindir}/qemu-hppa-static %attr(755,root,root) %{_bindir}/qemu-i386-static +%attr(755,root,root) %{_bindir}/qemu-loongarch-static %attr(755,root,root) %{_bindir}/qemu-m68k-static %attr(755,root,root) %{_bindir}/qemu-microblaze-static %attr(755,root,root) %{_bindir}/qemu-microblazeel-static @@ -1525,6 +1528,7 @@ fi %files system-mips %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/qemu-system-loongarch64 %attr(755,root,root) %{_bindir}/qemu-system-mips %attr(755,root,root) %{_bindir}/qemu-system-mipsel %attr(755,root,root) %{_bindir}/qemu-system-mips64 diff --git a/x32.patch b/x32.patch deleted file mode 100644 index 9cd3701..0000000 --- a/x32.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qemu-7.0.0/configure.orig 2022-10-02 20:59:57.508988228 +0200 -+++ qemu-7.0.0/configure 2022-10-02 21:09:37.279180676 +0200 -@@ -2705,7 +2705,7 @@ QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_confi - - # 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 "$targetos" != "haiku" && test "$softmmu" = yes ; then - # Different host OS linkers have different ideas about the name of the ELF -- 2.44.0