[libvirt] [PATCH] spec: sanlock is x86_64 only on RHEL

[Jiri Denemark]

On Tue, May 06, 2014 at 05:58:32 -0600, Eric Blake wrote:
> On 05/06/2014 01:40 AM, Jiri Denemark wrote:
> > Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> > ---
> >  libvirt.spec.in | 9 ++-------
> >  1 file changed, 2 insertions(+), 7 deletions(-)
> > 
> > diff --git a/libvirt.spec.in b/libvirt.spec.in
> > index aeccf4f..84d5bf3 100644
> > --- a/libvirt.spec.in
> > +++ b/libvirt.spec.in
> > @@ -262,16 +262,11 @@
> >  %endif
> >  
> >  # Enable sanlock library for lock management with QEMU
> > -# Sanlock is available only on i686 x86_64 for RHEL
> > +# Sanlock is available only on x86_64 for RHEL
> >  %if 0%{?fedora} >= 16
> >      %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}}
> >  %endif
> > -%if 0%{?rhel} == 6
> > -    %ifarch %{ix86} x86_64
> > -        %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}}
> > -    %endif
> > -%endif
> > -%if 0%{?rhel} >= 7
> > +%if 0%{?rhel} >= 6
> >      %ifarch x86_64
> >          %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}}
> >      %endif
> 
> The only real change you are making here is that you are crippling
> sanlock for ix86 on RHEL 6 (RHEL 7 is unchanged).  Meanwhile, I compared
> to the spec file that shipped with RHEL 6.5:
> 
> # Sanlock is available only on x86_64 for RHEL-6 on all arches after that
> %if 0%{?fedora} >= 16
> %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}}
> %endif
> %if 0%{?rhel} == 6
> %ifarch x86_64
> %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}}
> %endif
> %endif
> %if 0%{?rhel} >= 7
> %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}}
> %endif
> 
> which enabled sanlock only on x86_64 for RHEL 6, and unconditionally
> enables it for RHEL 7.  Then when you look at the current RHEL 7 beta
> product line, it is not built for ix86, only x86_64.  So your
> formulation is shorter and appears to accomplish the same limitations,
> as well as having the benefit of matching what downstream already changed.
> 
> ACK.

Pushed, thanks.

Jirka