X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=qemu.spec;h=2e80cb0e35b641f4df83fdafc22fa9ce0b59ee51;hb=f1ad8498cf562c6d4769cbda9e75d894f435de98;hp=ec8c547dd02a35757da5eb406ecd0060188ea68b;hpb=788ce17f143480ddefe3b82d8bfdfd1fb70e22f8;p=packages%2Fqemu.git

diff --git a/qemu.spec b/qemu.spec
index ec8c547..2e80cb0 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,10 +1,11 @@
-# TODO: archipelago (libxseg) on bcond (GPL v3 vs v2-only conflict)
 #
 # Conditional build:
 %bcond_without	sdl		# SDL UI and audio support
+%bcond_without	gl		# Don't require gl deps
 %bcond_without	ceph		# Ceph/RBD support
 %bcond_without	glusterfs	# GlusterFS backend
 %bcond_without	rdma		# RDMA-based migration support
+%bcond_with	xseg		# Archipelago backend [non-distributable: GPLv3+ vs GPLv2-only]
 %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
@@ -32,13 +33,12 @@
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
-Version:	2.3.0
-Release:	2
+Version:	2.6.1
+Release:	1
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	2fab3ea4460de9b57192e5b8b311f221
-Source2:	%{name}.binfmt
+# Source0-md5:	6a183b192018192943b6781e1bb9b72f
 # Loads kvm kernel modules at boot
 Source3:	kvm-modules-load.conf
 # Creates /dev/kvm
@@ -48,17 +48,16 @@ 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}-system-libcacard.patch
-Patch4:		%{name}-xattr.patch
-Patch5:		libjpeg-boolean.patch
-Patch6:		CVE-2015-3456.patch
-# Proof of concept, for reference, do not remove
-Patch400:	%{name}-kde_virtual_workspaces_hack.patch
+Patch3:		%{name}-xattr.patch
+Patch4:		libjpeg-boolean.patch
+Patch5:		%{name}-sh.patch
 URL:		http://www.qemu-project.org/
-BuildRequires:	OpenGL-GLX-devel
+%{?with_gl:BuildRequires:	OpenGL-GLX-devel}
+%{?with_gl:BuildRequires:	OpenGL-devel}
 %{?with_sdl:BuildRequires:	SDL2-devel >= 2.0}
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bcc >= 0.16.21-2
@@ -69,13 +68,14 @@ BuildRequires:	bzip2-devel
 BuildRequires:	curl-devel
 BuildRequires:	cyrus-sasl-devel >= 2
 %{?with_esd:BuildRequires:	esound-devel}
-BuildRequires:	glib2-devel >= 1:2.12
+BuildRequires:	glib2-devel >= 1:2.22
 %{?with_glusterfs:BuildRequires:	glusterfs-devel >= 3.4}
 BuildRequires:	gnutls-devel > 2.10.0
 BuildRequires:	libaio-devel
 %{?with_smartcard:BuildRequires:	libcacard-devel}
 BuildRequires:	libcap-devel
 BuildRequires:	libcap-ng-devel
+%{?with_gl:BuildRequires:	libepoxy-devel}
 BuildRequires:	libfdt-devel
 %{?with_rdma:BuildRequires:	libibverbs-devel}
 %{?with_iscsi:BuildRequires:	libiscsi-devel >= 1.9.0}
@@ -87,10 +87,11 @@ BuildRequires:	libpng-devel
 BuildRequires:	libssh2-devel >= 1.2.8
 BuildRequires:	libusb-devel >= 1.0.13
 BuildRequires:	libuuid-devel
+%{?with_xseg:BuildRequires:	libxseg-devel}
 %{?with_lttng:BuildRequires:	lttng-ust-devel}
 BuildRequires:	lzo-devel >= 2
 BuildRequires:	ncurses-devel
-%{?with_smartcard:BuildRequires:	nss-devel >= 3.12.8}
+%{?with_smartcard:BuildRequires:	nss-devel >= 1:3.12.8}
 BuildRequires:	numactl-devel
 BuildRequires:	perl-Encode
 BuildRequires:	perl-tools-pod
@@ -213,7 +214,7 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	glib2 >= 1:2.12
+Requires:	glib2 >= 1:2.22
 %{?with_libnfs:Requires:	libnfs >= 1.9.3}
 Requires:	libssh2 >= 1.2.8
 Provides:	group(qemu)
@@ -249,6 +250,19 @@ images.
 Ten pakiet udostępnia działające z linii poleceń narzędzia do operacji
 na obrazach dysków.
 
+%package ivshmem
+Summary:	Client and server for QEMU ivshmem device
+Summary(pl.UTF-8):	Klient i serwer dla urządzeia ivshmem QEMU
+Group:		Development/Tools
+
+%description ivshmem
+This package provides client and server tools for QEMU's ivshmem
+device.
+
+%description ivshmem -l pl.UTF-8
+Ten pakiet udostępnia działające z linii poleceń narzędzia dla
+urządzenia ivshmem QEMU.
+
 %package user
 Summary:	QEMU user mode emulation of qemu targets
 Summary(pl.UTF-8):	QEMU - emulacja trybu użytkownika środowisk qemu
@@ -628,7 +642,7 @@ Ten pakiet zawiera emulator systemu z procesorem Xtensa.
 Summary:	QEMU guest agent
 Summary(pl.UTF-8):	Agent gościa QEMU
 Group:		Daemons
-Requires:	glib2 >= 1:2.12
+Requires:	glib2 >= 1:2.22
 Obsoletes:	qemu-kvm-guest-agent
 
 %description guest-agent
@@ -651,6 +665,18 @@ systemach-gościach, komunikującego się kanałem virtio-serial o nazwie
 
 Ten pakiet nie musi być zainstalowany w systemie hosta.
 
+%package module-block-archipelago
+Summary:	QEMU module for Archipelago block devices
+Summary(pl.UTF-8):	Moduł QEMU dla urządeń blokowych Archipelago
+Group:		Development/Tools
+Requires:	%{name}-common = %{version}-%{release}
+
+%description module-block-archipelago
+Archipelago block device support for QEMU.
+
+%description module-block-archipelago -l pl.UTF-8
+Moduł QEMU dla urządeń blokowych Archipelago.
+
 %package module-block-curl
 Summary:	QEMU module for 'curl' block devices
 Summary(pl.UTF-8):	Moduł QEMU dla urządeń blokowych typu 'curl'
@@ -663,6 +689,18 @@ Requires:	%{name}-common = %{version}-%{release}
 %description module-block-curl -l pl.UTF-8
 Moduł QEMU dla urządeń blokowych typu 'curl'.
 
+%package module-block-dmg
+Summary:	QEMU module for 'dmg' block devices
+Summary(pl.UTF-8):	Moduł QEMU dla urządeń blokowych typu 'dmg'
+Group:		Development/Tools
+Requires:	%{name}-common = %{version}-%{release}
+
+%description module-block-dmg
+'dmg' block device support for QEMU.
+
+%description module-block-dmg -l pl.UTF-8
+Moduł QEMU dla urządeń blokowych typu 'dmg'.
+
 %package module-block-gluster
 Summary:	QEMU module for 'gluster' block devices
 Summary(pl.UTF-8):	Moduł QEMU dla urządeń blokowych typu 'gluster'
@@ -717,13 +755,10 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-
-%{__mv} libcacard libcacard-use-system-lib
 
 # workaround for conflict with alsa/error.h
 ln -s ../error.h qapi/error.h
@@ -739,6 +774,7 @@ ln -s ../error.h qapi/error.h
 	--cc="%{__cc}" \
 	--host-cc="%{__cc}" \
 	--disable-strip \
+	%{__enable_disable xseg archipelago} \
 	--enable-attr \
 	%{__enable_disable bluetooth bluez} \
 	%{__enable_disable brlapi} \
@@ -755,7 +791,7 @@ ln -s ../error.h qapi/error.h
 	--with-sdlabi=2.0 \
 	%{__enable_disable seccomp} \
 	%{__enable_disable spice} \
-	%{__enable_disable smartcard smartcard-nss} \
+	%{__enable_disable smartcard smartcard} \
 	--enable-tpm \
 	--enable-trace-backends="nop%{?with_systemtap:,dtrace}%{?with_lttng:,ust}" \
 	%{__enable_disable usbredir usb-redir} \
@@ -765,7 +801,6 @@ ln -s ../error.h qapi/error.h
 	--enable-vnc-jpeg \
 	--enable-vnc-png \
 	--enable-vnc-sasl \
-	--enable-vnc-tls \
 	%{!?with_vte:--disable-vte} \
 	--enable-kvm \
 	%{__enable_disable xen} \
@@ -774,7 +809,6 @@ ln -s ../error.h qapi/error.h
 	%{__enable_disable libnfs} \
 	--enable-lzo \
 	%{__enable_disable snappy} \
-	--enable-quorum \
 	--audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \
 	--interp-prefix=%{_libdir}/qemu/lib-%%M \
 %if %{without gtk2} && %{without gtk3}
@@ -794,14 +828,16 @@ ln -s ../error.h qapi/error.h
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/lib/binfmt.d \
-	$RPM_BUILD_ROOT/etc/{sysconfig,udev/rules.d,modules-load.d} \
+install -d \
+	$RPM_BUILD_ROOT/etc/{qemu,sysconfig,udev/rules.d,modules-load.d} \
 	$RPM_BUILD_ROOT{%{_sysconfdir}/sasl,%{_sbindir}}
 
 %{__make} install \
 	%{!?with_smartcard:CONFIG_USB_SMARTCARD=n} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+echo "#allow br0" > $RPM_BUILD_ROOT/etc/qemu/bridge.conf
+
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/qemu-ifup
 #!/bin/sh
@@ -822,26 +858,7 @@ 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 i in dummy \
-%ifnarch %{ix86} %{x8664}
-	qemu-i386 \
-%endif
-%ifnarch arm
-	qemu-arm \
-%endif
-%ifnarch ppc ppc64
-	qemu-ppc \
-%endif
-%ifnarch sparc sparc64
-	qemu-sparc \
-%endif
-%ifnarch sh4
-	qemu-sh4 \
-%endif
-; do
-	test $i = dummy && continue
-	grep /$i:\$ %{SOURCE2} > $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i.conf
-done < %{SOURCE2}
+install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-{doc,tech}.html
@@ -891,11 +908,11 @@ fi
 %defattr(644,root,root,755)
 %doc LICENSE README qemu-doc.html qemu-tech.html qmp-commands.txt
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu/target-*.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sasl/qemu.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ksm
-%dir %{_sysconfdir}/qemu
+%dir /etc/qemu
+%attr(640,root,qemu) %config(noreplace) %verify(not md5 mtime size) /etc/qemu/bridge.conf
 %attr(755,root,root) %{_bindir}/virtfs-proxy-helper
 %attr(755,root,root) %{_bindir}/qemu-nbd
 %attr(755,root,root) %{_libdir}/qemu-bridge-helper
@@ -938,15 +955,15 @@ fi
 %{_datadir}/%{name}/pxe-virtio.rom
 %{_datadir}/%{name}/qemu_logo_no_text.svg
 %{_datadir}/%{name}/s390-ccw.img
-%{_datadir}/%{name}/s390-zipl.rom
 %{_datadir}/%{name}/sgabios.bin
 %{_datadir}/%{name}/slof.bin
 %{_datadir}/%{name}/spapr-rtas.bin
+%{_datadir}/%{name}/vgabios.bin
 %{_datadir}/%{name}/vgabios-cirrus.bin
 %{_datadir}/%{name}/vgabios-qxl.bin
 %{_datadir}/%{name}/vgabios-stdvga.bin
+%{_datadir}/%{name}/vgabios-virtio.bin
 %{_datadir}/%{name}/vgabios-vmware.bin
-%{_datadir}/%{name}/vgabios.bin
 
 %dir %{_libdir}/%{name}
 
@@ -955,9 +972,13 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-img
 %{_mandir}/man1/qemu-img.1*
 
+%files ivshmem
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ivshmem-client
+%attr(755,root,root) %{_bindir}/ivshmem-server
+
 %files user
 %defattr(644,root,root,755)
-/usr/lib/binfmt.d/qemu-*.conf
 %attr(755,root,root) %{_bindir}/qemu-aarch64
 %attr(755,root,root) %{_bindir}/qemu-alpha
 %attr(755,root,root) %{_bindir}/qemu-arm
@@ -985,6 +1006,7 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-sparc
 %attr(755,root,root) %{_bindir}/qemu-sparc32plus
 %attr(755,root,root) %{_bindir}/qemu-sparc64
+%attr(755,root,root) %{_bindir}/qemu-tilegx
 %attr(755,root,root) %{_bindir}/qemu-unicore32
 %attr(755,root,root) %{_bindir}/qemu-x86_64
 
@@ -1074,7 +1096,6 @@ fi
 %{_datadir}/%{name}/bios.bin
 %{_datadir}/%{name}/bios-256k.bin
 %{_datadir}/%{name}/acpi-dsdt.aml
-%{_datadir}/%{name}/q35-acpi-dsdt.aml
 
 %files system-xtensa
 %defattr(644,root,root,755)
@@ -1083,12 +1104,24 @@ 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}/man8/qemu-ga.8*
+
+%if %{with xseg}
+%files module-block-archipelago
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/block-archipelago.so
+%endif
 
 %files module-block-curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/block-curl.so
 
+%files module-block-dmg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/block-dmg.so
+
 %if %{with glusterfs}
 %files module-block-gluster
 %defattr(644,root,root,755)