Signed-off-by: Jim Fehlig <jfehlig@xxxxxxxx>
---
libvirt.spec.in | 57 ++++-----------------------------------------------------
1 file changed, 4 insertions(+), 53 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index b55a947ec..dcfa50022 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -18,7 +18,6 @@
%{!?enable_autotools:%global enable_autotools 0}
# The hypervisor drivers that run in libvirtd
-%define with_xen 0%{!?_without_xen:1}
%define with_qemu 0%{!?_without_qemu:1}
%define with_lxc 0%{!?_without_lxc:1}
%define with_uml 0%{!?_without_uml:1}
@@ -96,7 +95,6 @@
# Xen is available only on i386 x86_64 ia64
%ifnarch %{ix86} x86_64 ia64
- %define with_xen 0
%define with_libxl 0
%endif
@@ -161,11 +159,6 @@
%define with_firewalld 1
%endif
-# RHEL-6 stopped including Xen on all archs.
-%if 0%{?rhel}
- %define with_xen 0
-%endif
-
# fuse is used to provide virtualized /proc for LXC
%if %{with_lxc} && 0%{?rhel} != 6
%define with_fuse 0%{!?_without_fuse:1}
@@ -280,9 +273,6 @@ Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
%if %{with_uml}
Requires: libvirt-daemon-driver-uml = %{version}-%{release}
%endif
-%if %{with_xen}
-Requires: libvirt-daemon-driver-xen = %{version}-%{release}
-%endif
%if %{with_vbox}
Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
%endif
@@ -316,7 +306,7 @@ BuildRequires: %{python}
%if %{with_systemd}
BuildRequires: systemd-units
%endif
-%if %{with_xen} || %{with_libxl}
+%if %{with_libxl}
BuildRequires: xen-devel
%endif
BuildRequires: libxml2-devel
@@ -376,11 +366,6 @@ BuildRequires: util-linux
BuildRequires: libacl-devel
# From QEMU RPMs
BuildRequires: /usr/bin/qemu-img
-%else
- %if %{with_xen}
-# From Xen RPMs
-BuildRequires: /usr/sbin/qcow-create
- %endif
%endif
# For LVM drivers
BuildRequires: lvm2
@@ -629,11 +614,6 @@ Requires: util-linux
%if %{with_qemu}
# From QEMU RPMs
Requires: /usr/bin/qemu-img
-%else
- %if %{with_xen}
-# From Xen RPMs
-Requires: /usr/sbin/qcow-create
- %endif
%endif
%description daemon-driver-storage-core
@@ -838,19 +818,6 @@ User Mode Linux
%endif
-%if %{with_xen}
-%package daemon-driver-xen
-Summary: Xen driver plugin for the libvirtd daemon
-Group: Development/Libraries
-Requires: libvirt-daemon = %{version}-%{release}
-
-%description daemon-driver-xen
-The Xen driver plugin for the libvirtd daemon, providing
-an implementation of the hypervisor driver APIs using
-Xen
-%endif
-
-
%if %{with_vbox}
%package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon
@@ -961,15 +928,12 @@ capabilities of UML
%endif
-%if %{with_xen} || %{with_libxl}
+%if %{with_libxl}
%package daemon-xen
Summary: Server side daemon & driver required to run XEN guests
Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
- %if %{with_xen}
-Requires: libvirt-daemon-driver-xen = %{version}-%{release}
- %endif
%if %{with_libxl}
Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
%endif
@@ -1164,12 +1128,6 @@ echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}"
exit 1
%endif
-%if %{with_xen}
- %define arg_xen --with-xen
-%else
- %define arg_xen --without-xen
-%endif
-
%if %{with_qemu}
%define arg_qemu --with-qemu
%else
@@ -1337,8 +1295,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
%endif
rm -f po/stamp-po
-%configure %{?arg_xen} \
- %{?arg_qemu} \
+%configure %{?arg_qemu} \
%{?arg_openvz} \
%{?arg_lxc} \
%{?arg_vbox} \
@@ -1997,12 +1954,6 @@ exit 0
%{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so
%endif
-%if %{with_xen}
-%files daemon-driver-xen
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so
-%endif
-
%if %{with_libxl}
%files daemon-driver-libxl
%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
@@ -2037,7 +1988,7 @@ exit 0
%files daemon-uml
%endif
-%if %{with_xen} || %{with_libxl}
+%if %{with_libxl}
%files daemon-xen
%endif
--
2.16.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
