- updated to 5.0.0, updated BRs

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index cf2e10656d60a29aa4c9b1208d4bf110c0743f65..970fe4608865dc3b897883ebd6951299463fda74 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,24 +1,22 @@
-diff -urp qemu-2.12.0.orig/configure qemu-2.12.0/configure
---- qemu-2.12.0.orig/configure 2018-05-01 18:42:52.740082920 +0000
-+++ qemu-2.12.0/configure      2018-05-01 18:44:59.949081487 +0000
-@@ -535,10 +535,6 @@ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strin
- QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
+--- qemu-5.0.0./configure.orig 2020-05-09 00:48:28.237641000 +0200
++++ qemu-5.0.0./configure      2020-05-09 00:50:39.164641000 +0200
+@@ -603,9 +603,6 @@
  QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
  QEMU_INCLUDES="-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel/tcg -iquote \$(SRC_PATH)/include"
+ QEMU_INCLUDES="$QEMU_INCLUDES -iquote \$(SRC_PATH)/disas/libvixl"
 -if test "$debug_info" = "yes"; then
 -    CFLAGS="-g $CFLAGS"
--    LDFLAGS="-g $LDFLAGS"
 -fi
  
- # make source path absolute
- source_path=$(cd "$source_path"; pwd)
-@@ -5420,12 +5416,8 @@ fi
+ # running configure in the source tree?
+ # we know that's the case if configure is there.
+@@ -6258,12 +6255,8 @@
  write_c_skeleton
  
  if test "$gcov" = "yes" ; then
--  CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
-+  CFLAGS="-fprofile-arcs -ftest-coverage $CFLAGS"
-   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
+-  QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
++  QEMU_CFLAGS="-fprofile-arcs -ftest-coverage $QEMU_CFLAGS"
+   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
 -elif test "$fortify_source" = "yes" ; then
 -  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
 -elif test "$debug" = "no"; then

diff --git a/qemu.spec b/qemu.spec
index 92c5ac92432e9c1cd1e9f5f33f0b054f889f2f03..4d1bfbc4e0277b83cf3abb85cd9679aaa15f8785 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -12,7 +12,6 @@
 %bcond_without oss             # OSS audio support
 %bcond_without pulseaudio      # PulseAudio audio support
 %bcond_without xen             # Xen backend driver support
-%bcond_without bluetooth       # bluetooth support
 %bcond_with    brlapi          # brlapi support
 %bcond_without smartcard       # smartcard-nss support
 %bcond_without iscsi           # iscsi support
@@ -39,12 +38,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       4.2.0
+Version:       5.0.0
 Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz
-# Source0-md5: 278eeb294e4b497e79af7a57e660cb9a
+# Source0-md5: ede6005d7143fe994dd089d31dc2cf6c
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm
@@ -68,7 +67,6 @@ URL:          http://www.qemu-project.org/
 %{?with_sdl:BuildRequires:     SDL2-devel >= 2.0}
 BuildRequires: alsa-lib-devel
 BuildRequires: bcc >= 0.16.21-2
-%{?with_bluetooth:BuildRequires:       bluez-libs-devel}
 %{?with_brlapi:BuildRequires:  brlapi-devel}
 BuildRequires: bzip2-devel
 %{?with_ceph:BuildRequires:    ceph-devel}
@@ -78,16 +76,20 @@ BuildRequires:      cyrus-sasl-devel >= 2
 BuildRequires: glib2-devel >= 1:2.22
 %{?with_glusterfs:BuildRequires:       glusterfs-devel >= 3.4}
 BuildRequires: gnutls-devel >= 3.1.18
+BuildRequires: gperftools-devel
+BuildRequires: jemalloc-devel
 BuildRequires: libaio-devel
 %{?with_smartcard:BuildRequires:       libcacard-devel}
 BuildRequires: libcap-devel
 BuildRequires: libcap-ng-devel
 %{?with_gl:BuildRequires:      libepoxy-devel}
 BuildRequires: libfdt-devel >= 1.4.2
+BuildRequires: libgcrypt-devel
 %{?with_rdma:BuildRequires:    libibverbs-devel}
 %{?with_iscsi:BuildRequires:   libiscsi-devel >= 1.9.0}
 %{?with_rdma:BuildRequires:    libibumad-devel}
-BuildRequires: libjpeg-devel
+BuildRequires: liburing-devel
+BuildRequires: libjpeg-turbo-devel
 %{?with_libnfs:BuildRequires:  libnfs-devel >= 1.9.3}
 BuildRequires: libpng-devel
 %{?with_rdma:BuildRequires:    librdmacm-devel}
@@ -98,8 +100,10 @@ BuildRequires:      libuuid-devel
 %{?with_lttng:BuildRequires:   lttng-ust-devel}
 BuildRequires: lzo-devel >= 2
 BuildRequires: ncurses-devel
+BuildRequires: nettle-devel
 %{?with_smartcard:BuildRequires:       nss-devel >= 1:3.12.8}
 BuildRequires: numactl-devel
+BuildRequires: pam-devel
 BuildRequires: perl-Encode
 BuildRequires: perl-tools-pod
 BuildRequires: pixman-devel >= 0.21.8
@@ -126,6 +130,7 @@ BuildRequires:      xfsprogs-devel
 %{?with_xkbcommon:BuildRequires:       xorg-lib-libxkbcommon-devel}
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: zlib-devel
+BuildRequires: zstd-devel >= 1.4.0
 %if %{with gtk3}
 BuildRequires: gtk+3-devel >= 3.14.0
 %{?with_vte:BuildRequires:     vte-devel >= 0.32.0}
@@ -133,8 +138,10 @@ BuildRequires:     gtk+3-devel >= 3.14.0
 %if %{with user_static}
 BuildRequires: glib2-static
 BuildRequires: glibc-static
+BuildRequires: liburing-static
 BuildRequires: pcre-static
 BuildRequires: zlib-static
+BuildRequires: zstd-static
 %endif
 BuildConflicts:        libslirp-devel
 Requires:      %{name}-img = %{version}-%{release}
@@ -153,6 +160,7 @@ Requires:   %{name}-system-or1k = %{version}-%{release}
 Requires:      %{name}-system-ppc = %{version}-%{release}
 Requires:      %{name}-system-riscv32 = %{version}-%{release}
 Requires:      %{name}-system-riscv64 = %{version}-%{release}
+Requires:      %{name}-system-rx = %{version}-%{release}
 Requires:      %{name}-system-s390x = %{version}-%{release}
 Requires:      %{name}-system-sh4 = %{version}-%{release}
 Requires:      %{name}-system-sparc = %{version}-%{release}
@@ -602,6 +610,26 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem RISC-V (64 bit).
 
+%package system-rx
+Summary:       QEMU system emulator for RX
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem RX
+Group:         Development/Tools
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+Obsoletes:     qemu-kvm-system-rx
+
+%description system-rx
+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 RX CPU.
+
+%description system-rx -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 RX.
+
 %package system-s390x
 Summary:       QEMU system emulator for S390
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem S390
@@ -874,7 +902,6 @@ build dynamic \
        --extra-cflags="%{rpmcflags} %{rpmcppflags} -fPIE -DPIE" \
        --extra-ldflags="%{rpmldflags} -pie -Wl,-z,relro -Wl,-z,now" \
        --enable-attr \
-       %{__enable_disable bluetooth bluez} \
        %{__enable_disable brlapi} \
        --enable-cap-ng \
        --enable-curl \
@@ -984,9 +1011,6 @@ install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -p %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/qemu-ga
 install -p %{SOURCE14} $RPM_BUILD_ROOT/etc/logrotate.d/qemu-ga
 
-# packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
-
 %if %{with system_seabios}
 ln -sf /usr/share/seabios/bios.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/bios-256k.bin
 # bios.bin provided by qemu is stripped to 128k, with no Xen support, keep it
@@ -1039,7 +1063,6 @@ fi
 %files common -f %{name}.lang
 %defattr(644,root,root,755)
 %doc LICENSE README.rst
-%doc build-dynamic/qemu-doc.html
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
 %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sasl/qemu.conf
@@ -1052,20 +1075,25 @@ fi
 %{?with_xkbcommon:%attr(755,root,root) %{_bindir}/qemu-keymap}
 %attr(755,root,root) %{_bindir}/qemu-nbd
 %attr(755,root,root) %{_bindir}/qemu-pr-helper
+%attr(755,root,root) %{_bindir}/qemu-storage-daemon
 %attr(755,root,root) %{_bindir}/qemu-tilegx
 %attr(755,root,root) %{_libexecdir}/qemu-bridge-helper
+%attr(755,root,root) %{_libexecdir}/virtiofsd
 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*
+%{_mandir}/man1/virtiofsd.1*
 %{_mandir}/man7/qemu-cpu-models.7*
 %{_mandir}/man7/qemu-block-drivers.7*
 %{_mandir}/man8/qemu-nbd.8*
 
 %dir %{_datadir}/qemu
 %dir %{_datadir}/%{name}/firmware
+%dir %{_datadir}/%{name}/vhost-user
 %{_datadir}/%{name}/keymaps
 %{_datadir}/%{name}/trace-events-all
+%{_datadir}/%{name}/vhost-user/50-qemu-virtiofsd.json
 
 # various bios images
 # all should be probably moved to the right system subpackage
@@ -1084,10 +1112,10 @@ fi
 %{_datadir}/%{name}/multiboot.bin
 %{_datadir}/%{name}/openbios-ppc
 %{_datadir}/%{name}/openbios-sparc*
+%{_datadir}/%{name}/opensbi-riscv32-sifive_u-fw_jump.bin
 %{_datadir}/%{name}/palcode-clipper
 %{_datadir}/%{name}/petalogix-ml605.dtb
 %{_datadir}/%{name}/petalogix-s3adsp1800.dtb
-%{_datadir}/%{name}/ppc_rom.bin
 %{_datadir}/%{name}/pvh.bin
 %{_datadir}/%{name}/pxe-e1000.rom
 %{_datadir}/%{name}/pxe-eepro100.rom
@@ -1101,7 +1129,6 @@ fi
 %{_datadir}/%{name}/sgabios.bin
 %{_datadir}/%{name}/skiboot.lid
 %{_datadir}/%{name}/slof.bin
-#%{_datadir}/%{name}/spapr-rtas.bin
 %{_datadir}/%{name}/vgabios.bin
 %{_datadir}/%{name}/vgabios-ati.bin
 %{_datadir}/%{name}/vgabios-bochs-display.bin
@@ -1294,6 +1321,10 @@ fi
 %{_datadir}/%{name}/opensbi-riscv64-sifive_u-fw_jump.bin
 %{_datadir}/%{name}/opensbi-riscv64-virt-fw_jump.bin
 
+%files system-rx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-rx
+
 %files system-s390x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x