On 12/05/2011 10:38 AM, Eric Blake wrote:
* libvirt.spec.in (with_sanlock): On RHEL, don't force sanlock on architectures where it isn't available. --- libvirt.spec.in | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in index 35762a5..39c814a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -174,8 +174,14 @@ %endif
# Enable sanlock library for lock management with QEMU -%if 0%{?fedora} >= 16 || 0%{?rhel} >= 6 -%define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} ++# Sanlock is available only on i686 x86_64 for RHEL ^
Aargh - I sent the mail before saving in my editor. Drop that extra '+' if you want to test this one.
+%if 0%{?fedora} >= 16 +%define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} +%endif +%if 0%{?rhel} >= 6 +%ifnarch i386 i586 i686 x86_64 +%define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} +%endif %endif
# Disable some drivers when building without libvirt daemon.
-- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org