提交 bdb6ba0f 编写于 作者: J Jim Fehlig

spec: remove legacy xen driver

Signed-off-by: NJim Fehlig <jfehlig@suse.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 e2e76de0
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
%{!?enable_autotools:%global enable_autotools 0} %{!?enable_autotools:%global enable_autotools 0}
# The hypervisor drivers that run in libvirtd # The hypervisor drivers that run in libvirtd
%define with_xen 0%{!?_without_xen:1}
%define with_qemu 0%{!?_without_qemu:1} %define with_qemu 0%{!?_without_qemu:1}
%define with_lxc 0%{!?_without_lxc:1} %define with_lxc 0%{!?_without_lxc:1}
%define with_uml 0%{!?_without_uml:1} %define with_uml 0%{!?_without_uml:1}
...@@ -96,7 +95,6 @@ ...@@ -96,7 +95,6 @@
# Xen is available only on i386 x86_64 ia64 # Xen is available only on i386 x86_64 ia64
%ifnarch %{ix86} x86_64 ia64 %ifnarch %{ix86} x86_64 ia64
%define with_xen 0
%define with_libxl 0 %define with_libxl 0
%endif %endif
...@@ -161,11 +159,6 @@ ...@@ -161,11 +159,6 @@
%define with_firewalld 1 %define with_firewalld 1
%endif %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 # fuse is used to provide virtualized /proc for LXC
%if %{with_lxc} && 0%{?rhel} != 6 %if %{with_lxc} && 0%{?rhel} != 6
%define with_fuse 0%{!?_without_fuse:1} %define with_fuse 0%{!?_without_fuse:1}
...@@ -280,9 +273,6 @@ Requires: libvirt-daemon-driver-qemu = %{version}-%{release} ...@@ -280,9 +273,6 @@ Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
%if %{with_uml} %if %{with_uml}
Requires: libvirt-daemon-driver-uml = %{version}-%{release} Requires: libvirt-daemon-driver-uml = %{version}-%{release}
%endif %endif
%if %{with_xen}
Requires: libvirt-daemon-driver-xen = %{version}-%{release}
%endif
%if %{with_vbox} %if %{with_vbox}
Requires: libvirt-daemon-driver-vbox = %{version}-%{release} Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
%endif %endif
...@@ -316,7 +306,7 @@ BuildRequires: %{python} ...@@ -316,7 +306,7 @@ BuildRequires: %{python}
%if %{with_systemd} %if %{with_systemd}
BuildRequires: systemd-units BuildRequires: systemd-units
%endif %endif
%if %{with_xen} || %{with_libxl} %if %{with_libxl}
BuildRequires: xen-devel BuildRequires: xen-devel
%endif %endif
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
...@@ -376,11 +366,6 @@ BuildRequires: util-linux ...@@ -376,11 +366,6 @@ BuildRequires: util-linux
BuildRequires: libacl-devel BuildRequires: libacl-devel
# From QEMU RPMs # From QEMU RPMs
BuildRequires: /usr/bin/qemu-img BuildRequires: /usr/bin/qemu-img
%else
%if %{with_xen}
# From Xen RPMs
BuildRequires: /usr/sbin/qcow-create
%endif
%endif %endif
# For LVM drivers # For LVM drivers
BuildRequires: lvm2 BuildRequires: lvm2
...@@ -634,11 +619,6 @@ Requires: util-linux ...@@ -634,11 +619,6 @@ Requires: util-linux
%if %{with_qemu} %if %{with_qemu}
# From QEMU RPMs # From QEMU RPMs
Requires: /usr/bin/qemu-img Requires: /usr/bin/qemu-img
%else
%if %{with_xen}
# From Xen RPMs
Requires: /usr/sbin/qcow-create
%endif
%endif %endif
%description daemon-driver-storage-core %description daemon-driver-storage-core
...@@ -843,19 +823,6 @@ User Mode Linux ...@@ -843,19 +823,6 @@ User Mode Linux
%endif %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} %if %{with_vbox}
%package daemon-driver-vbox %package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon Summary: VirtualBox driver plugin for the libvirtd daemon
...@@ -966,15 +933,12 @@ capabilities of UML ...@@ -966,15 +933,12 @@ capabilities of UML
%endif %endif
%if %{with_xen} || %{with_libxl} %if %{with_libxl}
%package daemon-xen %package daemon-xen
Summary: Server side daemon & driver required to run XEN guests Summary: Server side daemon & driver required to run XEN guests
Group: Development/Libraries Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
%if %{with_xen}
Requires: libvirt-daemon-driver-xen = %{version}-%{release}
%endif
%if %{with_libxl} %if %{with_libxl}
Requires: libvirt-daemon-driver-libxl = %{version}-%{release} Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
%endif %endif
...@@ -1169,12 +1133,6 @@ echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}" ...@@ -1169,12 +1133,6 @@ echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}"
exit 1 exit 1
%endif %endif
%if %{with_xen}
%define arg_xen --with-xen
%else
%define arg_xen --without-xen
%endif
%if %{with_qemu} %if %{with_qemu}
%define arg_qemu --with-qemu %define arg_qemu --with-qemu
%else %else
...@@ -1342,8 +1300,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) ...@@ -1342,8 +1300,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
%endif %endif
rm -f po/stamp-po rm -f po/stamp-po
%configure %{?arg_xen} \ %configure %{?arg_qemu} \
%{?arg_qemu} \
%{?arg_openvz} \ %{?arg_openvz} \
%{?arg_lxc} \ %{?arg_lxc} \
%{?arg_vbox} \ %{?arg_vbox} \
...@@ -2002,12 +1959,6 @@ exit 0 ...@@ -2002,12 +1959,6 @@ exit 0
%{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so %{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so
%endif %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} %if %{with_libxl}
%files daemon-driver-libxl %files daemon-driver-libxl
%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
...@@ -2042,7 +1993,7 @@ exit 0 ...@@ -2042,7 +1993,7 @@ exit 0
%files daemon-uml %files daemon-uml
%endif %endif
%if %{with_xen} || %{with_libxl} %if %{with_libxl}
%files daemon-xen %files daemon-xen
%endif %endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册