X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qemu.spec;h=0b41fd026e2f75e25c2646804e9e405531b72837;hb=2f4743de8602de5407e16e2810e5af9d770b04e5;hp=810055e7343e60c568e16469be15f78744c4e536;hpb=cfb9a655e726de941cb3954b8caae7478af9cc73;p=packages%2Fqemu.git

diff --git a/qemu.spec b/qemu.spec
index 810055e..0b41fd0 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -19,13 +19,14 @@
 %bcond_without	iscsi		# iscsi support
 %bcond_without	libnfs		# NFS support
 %bcond_without	multipath	# Multipath support
+%bcond_without	pmem		# libpmem (persistent memory) support
 %bcond_without	seccomp		# seccomp support
 %bcond_without	usbredir	# usb network redirection support
 %bcond_without	system_seabios	# system seabios binary
 %bcond_without	snappy		# snappy compression library
 %bcond_without	user_static	# build linux-user static packages
 %bcond_with	lttng		# lttng-ust trace backend support [needs update]
-%bcond_with	systemtap	# SystemTap/dtrace trace backend support
+%bcond_without	systemtap	# SystemTap/dtrace trace backend support
 %bcond_without	virgl		# build virgl support
 %bcond_with	vxhs		# Veritas HyperScale vDisk backend support (builtin; module not supported)
 %bcond_without	xkbcommon	# xkbcommon support
@@ -36,12 +37,15 @@
 %ifarch x32
 %undefine	with_xen
 %endif
+%ifnarch %{x8664} aarch64
+%undefine	with_pmem
+%endif
 
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
 Version:	5.0.0
-Release:	1
+Release:	3
 License:	GPL v2, BSD (edk2 firmware files)
 Group:		Applications/Emulators
 Source0:	https://download.qemu.org/%{name}-%{version}.tar.xz
@@ -125,6 +129,7 @@ BuildRequires:	perl-Encode
 BuildRequires:	perl-tools-pod
 BuildRequires:	pixman-devel >= 0.21.8
 BuildRequires:	pkgconfig
+%{?with_pmem:BuildRequires:	pmdk-devel}
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	python3 >= 1:3.5
 BuildRequires:	rpmbuild(macros) >= 1.644
@@ -930,6 +935,19 @@ QEMU SDL UI and audio driver.
 %description module-ui-sdl -l pl.UTF-8
 Sterownik interfejsu użytkownika i dźwięku SDL dla QEMU.
 
+%package -n systemtap-qemu
+Summary:	systemtap/dtrace probes for QEMU
+Summary(pl.UTF-8):	Sondy systemtap/dtrace dla QEMU
+Group:		Development/Tools
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	systemtap-client
+
+%description -n systemtap-qemu
+systemtap/dtrace probes for QEMU.
+
+%description -n systemtap-qemu -l pl.UTF-8
+Sondy systemtap/dtrace dla QEMU.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -940,9 +958,12 @@ Sterownik interfejsu użytkownika i dźwięku SDL dla QEMU.
 %patch5 -p1
 %patch6 -p1
 
-# workaround for conflict with alsa/error.h
-ln -s ../error.h qapi/error.h
+%{__sed} -i '1s,/usr/bin/env python3,%{__python3},' scripts/qemu-trace-stap
 
+%if %{with systemtap}
+# don't require stap binary during build
+%{__sed} -i -e "s/has 'stap'/true/" configure
+%endif
 %build
 
 build() {
@@ -990,6 +1011,7 @@ build dynamic \
 	%{!?with_gtk3:--disable-gtk} \
 	%{__enable_disable iscsi libiscsi} \
 	%{__enable_disable libnfs} \
+	%{__enable_disable pmem libpmem} \
 	--enable-lzo \
 	%{__enable_disable multipath mpath} \
 	--enable-modules \
@@ -1029,6 +1051,7 @@ build static \
 	--disable-guest-agent \
 	--disable-guest-agent-msi \
 	--disable-libnfs \
+	--disable-linux-io-uring \
 	--disable-mpath \
 	--disable-nettle \
 	--disable-pie \
@@ -1041,6 +1064,7 @@ build static \
 	--disable-vxhs \
 	--enable-user \
 	--disable-xkbcommon \
+	--disable-zstd \
 	--static
 %endif
 
@@ -1407,6 +1431,7 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-x86_64-static
 %attr(755,root,root) %{_bindir}/qemu-xtensa-static
 %attr(755,root,root) %{_bindir}/qemu-xtensaeb-static
+%attr(755,root,root) %{_bindir}/qemu-trace-stap-static
 %endif
 
 %files system-aarch64
@@ -1636,3 +1661,11 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/audio-sdl.so
 %attr(755,root,root) %{_libdir}/%{name}/ui-sdl.so
 %endif
+
+%if %{with systemtap}
+%files -n systemtap-qemu
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-trace-stap
+%{_datadir}/systemtap/tapset/qemu-*.stp
+%{_mandir}/man1/qemu-trace-stap.1*
+%endif