X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=qemu.spec;h=f146d065e133a81ad902da6c515d784f6d7e0d62;hb=9ff89d9f41cb570f7a85372075cadf02d0e0f72b;hp=6302a68095edf7dc5beb220b747243cf95940bab;hpb=790b7a021ab1b934ac5b1977cdd59d223c748d78;p=packages%2Fqemu.git diff --git a/qemu.spec b/qemu.spec index 6302a68..f146d06 100644 --- a/qemu.spec +++ b/qemu.spec @@ -5,7 +5,6 @@ %bcond_without ceph # Ceph/RBD support %bcond_without glusterfs # GlusterFS backend %bcond_without rdma # RDMA-based migration support -%bcond_with gtk2 # GTK+ 2.x instead of 3.x %bcond_without gtk3 # Do not build GTK+ UI %bcond_without vte # VTE support in GTK+ UI %bcond_without spice # SPICE support @@ -25,24 +24,27 @@ %bcond_without user_static # build linux-user static packages %bcond_with lttng # lttng-ust trace backend support %bcond_with systemtap # SystemTap/dtrace trace backend support - -%if %{with gtk2} -%undefine with_gtk3 -%endif +%bcond_with virgl # build virgl support +%bcond_without xkbcommon # xkbcommon support %ifarch x32 %undefine with_xen %endif +# ceph >= 14.0 no longer support 32-bit archs +%ifarch %{ix86} +%undefine with_ceph +%endif + Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 2.12.1 +Version: 4.1.1 Release: 1 License: GPL v2 Group: Applications/Emulators Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz -# Source0-md5: 6e830a88e36908d9563ed01131ce72ec +# Source0-md5: 53879f792ef2675c6c5e6cbf5cc1ac6c # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf # Creates /dev/kvm @@ -52,14 +54,11 @@ Source6: ksm.sysconfig Source7: ksmctl.c Source9: ksmtuned Source10: ksmtuned.conf -Source12: 99-%{name}-guest-agent.rules Patch0: %{name}-cflags.patch -Patch1: vgabios-widescreens.patch -Patch2: %{name}-whitelist.patch -Patch3: %{name}-user-execve.patch -Patch4: %{name}-xattr.patch -Patch5: libjpeg-boolean.patch -Patch6: x32.patch +Patch1: %{name}-whitelist.patch +Patch2: %{name}-user-execve.patch +Patch3: %{name}-xattr.patch +Patch4: libjpeg-boolean.patch URL: http://www.qemu-project.org/ %{?with_gl:BuildRequires: OpenGL-GLX-devel} %{?with_gl:BuildRequires: OpenGL-devel} @@ -75,7 +74,7 @@ BuildRequires: cyrus-sasl-devel >= 2 %{?with_esd:BuildRequires: esound-devel} BuildRequires: glib2-devel >= 1:2.22 %{?with_glusterfs:BuildRequires: glusterfs-devel >= 3.4} -BuildRequires: gnutls-devel > 2.10.0 +BuildRequires: gnutls-devel >= 3.1.18 BuildRequires: libaio-devel %{?with_smartcard:BuildRequires: libcacard-devel} BuildRequires: libcap-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.1.1} +%{?with_seccomp:BuildRequires: libseccomp-devel >= 2.3.0} BuildRequires: libssh2-devel >= 1.2.8 BuildRequires: libusb-devel >= 1.0.13 BuildRequires: libuuid-devel @@ -118,16 +117,15 @@ BuildRequires: texinfo %{?with_lttng:BuildRequires: userspace-rcu-devel} BuildRequires: vde2-devel BuildRequires: which +%{?with_virgl:BuildRequires: virglrenderer-devel} %{?with_xen:BuildRequires: xen-devel >= 3.4} BuildRequires: xfsprogs-devel +%{?with_xkbcommon:BuildRequires: xorg-lib-libxkbcommon-devel} BuildRequires: xorg-lib-libX11-devel BuildRequires: zlib-devel -%if %{with gtk2} -BuildRequires: gtk+2-devel >= 2:2.18.0 -%{?with_vte:BuildRequires: vte0-devel >= 0.24.0} -%endif %if %{with gtk3} -BuildRequires: gtk+3-devel >= 3.0.0 +BuildRequires: gtk+3-devel >= 3.14.0 +BuildRequires: Mesa-libEGL-devel %{?with_vte:BuildRequires: vte2.90-devel >= 0.32.0} %endif %if %{with user_static} @@ -136,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} @@ -169,19 +168,15 @@ Requires: SDL2 \ %endif \ Requires: libfdt >= 1.4.2 \ %if %{with seccomp} \ -Requires: libseccomp >= 2.1.0 \ +Requires: libseccomp >= 2.3.0 \ %endif \ Requires: libusb >= 1.0.13 \ Requires: pixman >= 0.21.8 \ %if %{with usbredir} \ Requires: usbredir >= 0.6 \ %endif \ -%if %{with gtk2} \ -Requires: gtk+2 >= 2:2.18.0 \ -%{?with_vte:Requires: vte0 >= 0.24.0} \ -%endif \ %if %{with gtk3} \ -Requires: gtk+3 >= 3.0.0 \ +Requires: gtk+3 >= 3.14.0 \ %{?with_vte:Requires: vte2.90 >= 0.32.0} \ %endif @@ -838,8 +833,6 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 # workaround for conflict with alsa/error.h ln -s ../error.h qapi/error.h @@ -890,7 +883,6 @@ build dynamic \ %{__enable_disable ceph rbd} \ %{__enable_disable rdma} \ %{__enable_disable sdl} \ - --with-sdlabi=2.0 \ %{__enable_disable seccomp} \ %{__enable_disable spice} \ %{__enable_disable smartcard smartcard} \ @@ -902,6 +894,7 @@ build dynamic \ --enable-vnc-png \ --enable-vnc-sasl \ %{!?with_vte:--disable-vte} \ + %{__enable_disable virgl virglrenderer} \ %{__enable_disable xen} \ --enable-modules \ --disable-netmap \ @@ -909,10 +902,8 @@ build dynamic \ --enable-lzo \ %{__enable_disable snappy} \ --audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \ -%if %{without gtk2} && %{without gtk3} +%if %{without gtk3} --disable-gtk -%else - --with-gtkabi="%{?with_gtk2:2.0}%{!?with_gtk2:3.0}" %endif %if %{with user_static} @@ -939,9 +930,6 @@ build static \ %endif -# rebuild patched vesa tables with additional widescreen modes. -%{__make} -C roms/vgabios stdvga-bios - %{__cc} %{SOURCE7} %{rpmcflags} -o ksmctl %install @@ -987,15 +975,9 @@ install -p ksmctl $RPM_BUILD_ROOT%{_sbindir} install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf -# For the qemu-guest-agent subpackage install the udev rules. -install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d - # packaged as %doc %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html -# install patched vesa tables with additional widescreen modes. -cp -p roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/vgabios-stdvga.bin - %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 @@ -1007,7 +989,7 @@ for f in $RPM_BUILD_ROOT%{_datadir}/%{name}/*.aml ; do done %endif -%if %{with gtk2} || %{with gtk3} +%if %{with gtk3} %{__mv} $RPM_BUILD_ROOT%{_localedir}/{de_DE,de} %{__mv} $RPM_BUILD_ROOT%{_localedir}/{fr_FR,fr} %find_lang %{name} @@ -1015,6 +997,8 @@ done : > qemu.lang %endif +%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/qemu + %clean rm -rf $RPM_BUILD_ROOT @@ -1043,8 +1027,10 @@ fi %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ksm %dir /etc/qemu %attr(640,root,qemu) %config(noreplace) %verify(not md5 mtime size) /etc/qemu/bridge.conf +%attr(755,root,root) %{_bindir}/elf2dmp %attr(755,root,root) %{_bindir}/virtfs-proxy-helper -%attr(755,root,root) %{_bindir}/qemu-keymap +%attr(755,root,root) %{_bindir}/qemu-edid +%{?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-tilegx @@ -1053,12 +1039,13 @@ fi %attr(755,root,root) %{_sbindir}/ksmtuned %{_mandir}/man1/qemu.1* %{_mandir}/man1/virtfs-proxy-helper.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 %{_datadir}/%{name}/keymaps -%{_datadir}/%{name}/qemu-icon.bmp %{_datadir}/%{name}/trace-events-all # various bios images @@ -1082,6 +1069,7 @@ fi %{_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 %{_datadir}/%{name}/pxe-ne2k_pci.rom @@ -1089,7 +1077,6 @@ fi %{_datadir}/%{name}/pxe-rtl8139.rom %{_datadir}/%{name}/pxe-virtio.rom %{_datadir}/%{name}/QEMU,cgthree.bin -%{_datadir}/%{name}/qemu_logo_no_text.svg %{_datadir}/%{name}/QEMU,tcx.bin %{_datadir}/%{name}/s390-ccw.img %{_datadir}/%{name}/sgabios.bin @@ -1097,8 +1084,11 @@ 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 +%{_datadir}/%{name}/vgabios-ramfb.bin %{_datadir}/%{name}/vgabios-stdvga.bin %{_datadir}/%{name}/vgabios-virtio.bin %{_datadir}/%{name}/vgabios-vmware.bin @@ -1107,14 +1097,16 @@ fi # modules without too many external dependencies %attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so -%attr(755,root,root) %{_libdir}/%{name}/block-nfs.so +%{?with_libnfs:%attr(755,root,root) %{_libdir}/%{name}/block-nfs.so} %attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so -%attr(755,root,root) %{_libdir}/%{name}/audio-pa.so -%attr(755,root,root) %{_libdir}/%{name}/audio-sdl.so +%{?with_pulseaudio:%attr(755,root,root) %{_libdir}/%{name}/audio-pa.so} +%{?with_sdl:%attr(755,root,root) %{_libdir}/%{name}/audio-sdl.so} %attr(755,root,root) %{_libdir}/%{name}/ui-curses.so +%if %{with gtk3} %attr(755,root,root) %{_libdir}/%{name}/ui-gtk.so -%attr(755,root,root) %{_libdir}/%{name}/ui-sdl.so +%endif +%{?with_sdl:%attr(755,root,root) %{_libdir}/%{name}/ui-sdl.so} %files img %defattr(644,root,root,755) @@ -1207,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) @@ -1215,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) @@ -1261,7 +1258,6 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-ppc %attr(755,root,root) %{_bindir}/qemu-system-ppc64 -%attr(755,root,root) %{_bindir}/qemu-system-ppcemb %{_datadir}/%{name}/canyonlands.dtb %{_datadir}/%{name}/qemu_vga.ndrv %{_datadir}/%{name}/u-boot.e500 @@ -1270,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) @@ -1308,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) @@ -1316,8 +1324,8 @@ fi %files guest-agent %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/99-qemu-guest-agent.rules %attr(755,root,root) %{_bindir}/qemu-ga +%{_mandir}/man7/qemu-ga-ref.7* %{_mandir}/man8/qemu-ga.8* %files module-block-curl