[libvirt] [PATCH] spec: Fix build without QEMU

Jiri Denemark posted 1 patch 5 years, 11 months ago
Failed in applying to current master (apply log)
libvirt.spec.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
[libvirt] [PATCH] spec: Fix build without QEMU
Posted by Jiri Denemark 5 years, 11 months ago
libvirt_qemu_probes.stp is only generated when QEMU driver is enabled.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 libvirt.spec.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 9ea5e6b32a..0e4a84c98c 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1412,8 +1412,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs
 %ifarch %{power64} s390x x86_64 ia64 alpha sparc64
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
    $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp
+
+    %if %{with_qemu}
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
    $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp
+    %endif
 %endif
 
 %check
@@ -1994,8 +1997,10 @@ exit 0
 %{_bindir}/virt-host-validate
 
 %{_datadir}/systemtap/tapset/libvirt_probes*.stp
-%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
 %{_datadir}/systemtap/tapset/libvirt_functions.stp
+%if %{with_qemu}
+%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
+%endif
 
 %if %{with_bash_completion}
 %{_datadir}/bash-completion/completions/virsh
-- 
2.17.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] spec: Fix build without QEMU
Posted by Michal Privoznik 5 years, 11 months ago
On 05/18/2018 06:02 PM, Jiri Denemark wrote:
> libvirt_qemu_probes.stp is only generated when QEMU driver is enabled.
> 
> Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
> ---
>  libvirt.spec.in | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

ACK

I tried chasing this down and specifically installed i686 Fedora. But
since we build with qemu there, I was unable to reproduce. Nice catch.

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list