Re: [libvirt] Enable kvm on aarch64, Cleanup F-16/18 conditionals
reposting to the upstream list - we'd like to keep the downstream .spec file in sync with upstream, rather than needlessly diverging. On 07/15/2014 10:52 AM, Peter Robinson wrote:
commit ae37ed3500672f12383825c84dd5ae940fb90ff8 Author: Peter Robinson <pbrobinson@gmail.com> Date: Tue Jul 15 17:52:18 2014 +0100
Enable kvm on aarch64, Cleanup F-16/18 conditionals
libvirt.spec | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) --- diff --git a/libvirt.spec b/libvirt.spec index fad21d9..213760d 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -55,14 +55,10 @@
%define with_qemu_tcg %{with_qemu} # Change if we ever provide qemu-kvm binaries on non-x86 hosts -%if 0%{?fedora} >= 18 - %if 0%{?fedora} >= 20 - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x %{arm} - %else - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x - %endif +%if 0%{?fedora} >= 20 + %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aarch64 %else - %define qemu_kvm_arches %{ix86} x86_64 + %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %endif
%ifarch %{qemu_kvm_arches} @@ -212,18 +208,6 @@ %define with_xen 0 %endif
-# Fedora doesn't have any QEMU on ppc64 until FC16 - only ppc -%if 0%{?fedora} && 0%{?fedora} < 16 - %ifarch ppc64 - %define with_qemu 0 - %endif -%endif - -# Fedora doesn't have new enough Xen for libxl until F18 -%if 0%{?fedora} && 0%{?fedora} < 18 - %define with_libxl 0 -%endif - # PolicyKit was introduced in Fedora 8 / RHEL-6 or newer %if 0%{?fedora} >= 8 || 0%{?rhel} >= 6 %define with_polkit 0%{!?_without_polkit:1} @@ -385,7 +369,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 1.2.6 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -2236,6 +2220,10 @@ exit 0 %doc examples/systemtap
%changelog +* Tue Jul 15 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.6-2 +- Enable kvm on aarch64 +- Cleanup F-16/18 conditionals + * Wed Jul 2 2014 Daniel P. Berrange <berrange@redhat.com> - 1.2.6-1 - Update to 1.2.6 release
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Tue, Jul 15, 2014 at 11:14:54AM -0600, Eric Blake wrote:
reposting to the upstream list - we'd like to keep the downstream .spec file in sync with upstream, rather than needlessly diverging.
On 07/15/2014 10:52 AM, Peter Robinson wrote:
commit ae37ed3500672f12383825c84dd5ae940fb90ff8 Author: Peter Robinson <pbrobinson@gmail.com> Date: Tue Jul 15 17:52:18 2014 +0100
Enable kvm on aarch64, Cleanup F-16/18 conditionals
libvirt.spec | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) --- diff --git a/libvirt.spec b/libvirt.spec index fad21d9..213760d 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -55,14 +55,10 @@
%define with_qemu_tcg %{with_qemu} # Change if we ever provide qemu-kvm binaries on non-x86 hosts -%if 0%{?fedora} >= 18 - %if 0%{?fedora} >= 20 - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x %{arm} - %else - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x - %endif +%if 0%{?fedora} >= 20 + %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aarch64 %else - %define qemu_kvm_arches %{ix86} x86_64 + %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %endif %ifarch %{qemu_kvm_arches} @@ -212,18 +208,6 @@ %define with_xen 0 %endif
-# Fedora doesn't have any QEMU on ppc64 until FC16 - only ppc -%if 0%{?fedora} && 0%{?fedora} < 16 - %ifarch ppc64 - %define with_qemu 0 - %endif -%endif - -# Fedora doesn't have new enough Xen for libxl until F18 -%if 0%{?fedora} && 0%{?fedora} < 18 - %define with_libxl 0 -%endif -
Historically we've kept support for building libvirt against Fedora versions even if unsupported by Fedora itself, because we've found people often stick on old Fedora versions. At some point though it does get a bit insane. eg we don't really need Fedora 8 support at this point. If we are going todo a cleanup though, we should do it throughout the spec, not just in these few places
# PolicyKit was introduced in Fedora 8 / RHEL-6 or newer %if 0%{?fedora} >= 8 || 0%{?rhel} >= 6 %define with_polkit 0%{!?_without_polkit:1} @@ -385,7 +369,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 1.2.6 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -2236,6 +2220,10 @@ exit 0 %doc examples/systemtap
Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
participants (2)
-
Daniel P. Berrange -
Eric Blake