!128 sync from 22.03 for dtrace

From: @yezengruan 
Reviewed-by: @imxcc 
Signed-off-by: @imxcc
This commit is contained in:
openeuler-ci-bot 2022-03-18 13:05:00 +00:00 committed by Gitee
commit 95cfb6d05a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -48,11 +48,7 @@
%define with_storage_zfs 0
%endif
%ifarch aarch64
%define arg_dtrace --without-dtrace
%else
%define arg_dtrace --with-dtrace
%endif
# We need a recent enough libiscsi (>= 1.18.0)
%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
@ -1279,7 +1275,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
# Copied into libvirt-docs subpackage eventually
mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
%ifarch %{power64} s390x x86_64 ia64 alpha sparc64
%ifarch %{power64} s390x ia64 alpha sparc64
mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp
@ -1845,7 +1841,7 @@ exit 0
%{_bindir}/virt-pki-validate
%{_bindir}/virt-host-validate
%ifnarch aarch64
%ifnarch aarch64 x86_64
%{_datadir}/systemtap/tapset/libvirt_probes*.stp
%{_datadir}/systemtap/tapset/libvirt_functions.stp
%if %{with_qemu}