[libvirt] [PATCH] Fixes for check and rpm builds without sanlock (and qemu)

[Eric Blake]

On 05/30/2012 09:35 AM, Martin Kletzander wrote:
> Apart from the non-sanlock check build, there is also a little fix for
> qemu (EXTRA_DIST had qemu.conf and others inside even if the build was
> supposed to be without qemu).
> ---
>  libvirt.spec.in |    5 +++++
>  src/Makefile.am |    6 +++++-
>  2 files changed, 10 insertions(+), 1 deletions(-)

> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index d4e43f6..3c544f1 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -1232,6 +1232,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
>  %endif
>  %find_lang %{name}
> 
> +%if ! %{with_sanlock}
> +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
> +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
> +%endif
> +

ACK to this hunk.

>  %if ! %{with_lxc}
>  rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug
>  rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 23747d7..e56a8ef 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -785,9 +785,9 @@ augeas_DATA += qemu/libvirtd_qemu.aug
>  augeastest_DATA += qemu/test_libvirtd_qemu.aug
>  CLEANFILES += qemu/test_libvirtd_qemu.aug
> 
> -endif
>  EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \
>  		qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt
> +endif

NACK to this hunk.  If we decide something is worth putting in the
tarball, then it must _always_ be in the tarball, regardless of
configure options.  How can I reproduce the failure you were seeing, so
that we can fix it properly?  If the problem is one of 'make dist'
failing when qemu is configured to be off, because EXTRA_DIST
unconditionally includes the file but the file is only generated under
HAVE_QEMU, then we need to either fix things so that the file can
unconditionally be generated, or so that the file is not part of the
tarball (and that depends on what tools are required for generating the
file).

> @@ -1147,6 +1147,7 @@ else
>  check-augeas-lxc:
>  endif
> 
> +if HAVE_SANLOCK
>  test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
>  		locking/qemu-sanlock.conf $(AUG_GENTEST)
>  	$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@
> @@ -1155,6 +1156,9 @@ check-augeas-sanlock: test_libvirt_sanlock.aug
>  	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
>  	    '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
>  	fi
> +else
> +check-augeas-sanlock:
> +endif

ACK to this hunk - if sanlock is not configured, then we don't need to
test it.

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120530/b6ab63fe/attachment-0001.sig>