提交 69a0f3ee 编写于 作者: M Mark McLoughlin

Enable netcf by default

Disabled on < f12 for now until netcf is in Fedora updates

BuildRequires netcf if enabled, pass --without-netcf if its disabled

* libvirt.spec.in: enabled netcf by default
上级 6a9948c0
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
%define with_numactl 0%{!?_without_numactl:1} %define with_numactl 0%{!?_without_numactl:1}
# default to off # default to off
%define with_capng 0%{!?_without_capng:0} %define with_capng 0%{!?_without_capng:0}
%define with_netcf 0%{!?_without_netcf:1}
# Xen is available only on i386 x86_64 ia64 # Xen is available only on i386 x86_64 ia64
%ifnarch i386 i586 i686 x86_64 ia64 %ifnarch i386 i586 i686 x86_64 ia64
...@@ -48,6 +49,10 @@ ...@@ -48,6 +49,10 @@
%define with_capng 0%{!?_without_capng:1} %define with_capng 0%{!?_without_capng:1}
%endif %endif
%if 0%{?fedora} >= 12
%define with_netcf 0%{!?_without_netcf:1}
%endif
%if 0%{?fedora} >= 12 %if 0%{?fedora} >= 12
%define qemu_user qemu %define qemu_user qemu
%define qemu_group qemu %define qemu_group qemu
...@@ -183,6 +188,9 @@ BuildRequires: libcap-ng-devel >= 0.5.0 ...@@ -183,6 +188,9 @@ BuildRequires: libcap-ng-devel >= 0.5.0
%if %{with_phyp} %if %{with_phyp}
BuildRequires: libssh-devel >= 0.3.1 BuildRequires: libssh-devel >= 0.3.1
%endif %endif
%if %{with_netcf}
BuildRequires: netcf-devel
%endif
# Fedora build root suckage # Fedora build root suckage
BuildRequires: gawk BuildRequires: gawk
...@@ -326,6 +334,10 @@ of recent versions of Linux (and other OSes). ...@@ -326,6 +334,10 @@ of recent versions of Linux (and other OSes).
%define _without_capng --without-capng %define _without_capng --without-capng
%endif %endif
%if ! %{with_netcf}
%define _without_netcf --without-netcf
%endif
%configure %{?_without_xen} \ %configure %{?_without_xen} \
%{?_without_qemu} \ %{?_without_qemu} \
%{?_without_openvz} \ %{?_without_openvz} \
...@@ -347,6 +359,7 @@ of recent versions of Linux (and other OSes). ...@@ -347,6 +359,7 @@ of recent versions of Linux (and other OSes).
%{?_without_storage_disk} \ %{?_without_storage_disk} \
%{?_without_numactl} \ %{?_without_numactl} \
%{?_without_capng} \ %{?_without_capng} \
%{?_without_netcf} \
--with-qemu-user=%{qemu_user} \ --with-qemu-user=%{qemu_user} \
--with-qemu-group=%{qemu_group} \ --with-qemu-group=%{qemu_group} \
--with-init-script=redhat \ --with-init-script=redhat \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册