!150 libvirt: build without dtrace (sync from master)
From: @yezengruan Reviewed-by: @kevinzhu1 Signed-off-by: @kevinzhu1
This commit is contained in:
commit
8ffe16e78d
21
libvirt.spec
21
libvirt.spec
@ -48,6 +48,8 @@
|
|||||||
%define with_storage_zfs 0
|
%define with_storage_zfs 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%define arg_dtrace --without-dtrace
|
||||||
|
|
||||||
# We need a recent enough libiscsi (>= 1.18.0)
|
# We need a recent enough libiscsi (>= 1.18.0)
|
||||||
%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
|
%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
|
||||||
|
|
||||||
@ -99,7 +101,7 @@
|
|||||||
Summary: Library providing a simple virtualization API
|
Summary: Library providing a simple virtualization API
|
||||||
Name: libvirt
|
Name: libvirt
|
||||||
Version: 6.2.0
|
Version: 6.2.0
|
||||||
Release: 17
|
Release: 18
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://libvirt.org/
|
URL: https://libvirt.org/
|
||||||
|
|
||||||
@ -1102,7 +1104,7 @@ cd %{_vpath_builddir}
|
|||||||
--with-libpcap \
|
--with-libpcap \
|
||||||
--with-macvtap \
|
--with-macvtap \
|
||||||
--with-audit \
|
--with-audit \
|
||||||
--with-dtrace \
|
%{?arg_dtrace} \
|
||||||
--with-driver-modules \
|
--with-driver-modules \
|
||||||
%{?arg_firewalld} \
|
%{?arg_firewalld} \
|
||||||
%{?arg_firewalld_zone} \
|
%{?arg_firewalld_zone} \
|
||||||
@ -1197,7 +1199,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
|
|||||||
# Copied into libvirt-docs subpackage eventually
|
# Copied into libvirt-docs subpackage eventually
|
||||||
mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
|
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 \
|
mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp
|
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp
|
||||||
|
|
||||||
@ -1763,10 +1765,12 @@ exit 0
|
|||||||
%{_bindir}/virt-pki-validate
|
%{_bindir}/virt-pki-validate
|
||||||
%{_bindir}/virt-host-validate
|
%{_bindir}/virt-host-validate
|
||||||
|
|
||||||
%{_datadir}/systemtap/tapset/libvirt_probes*.stp
|
%ifnarch aarch64 x86_64
|
||||||
%{_datadir}/systemtap/tapset/libvirt_functions.stp
|
%{_datadir}/systemtap/tapset/libvirt_probes*.stp
|
||||||
%if %{with_qemu}
|
%{_datadir}/systemtap/tapset/libvirt_functions.stp
|
||||||
%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
|
%if %{with_qemu}
|
||||||
|
%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_bash_completion}
|
%if %{with_bash_completion}
|
||||||
@ -1883,6 +1887,9 @@ exit 0
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 15 2022 yezengruan <yezengruan@huawei.com>
|
||||||
|
- libvir.spec: build without dtrace
|
||||||
|
|
||||||
* Tue Mar 08 2022 imxcc <xingchaochao@huawei.com>
|
* Tue Mar 08 2022 imxcc <xingchaochao@huawei.com>
|
||||||
- virsh: Display vhostuser socket path in domblklist
|
- virsh: Display vhostuser socket path in domblklist
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user