mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-03 04:45:46 +00:00
Prepare for using libcap-ng
This commit is contained in:
parent
2c359dd609
commit
1a982aef18
@ -1,3 +1,9 @@
|
|||||||
|
Mon Jun 29 12:28:20 BST 2009 Daniel P. Berrange <berrange@redhat.com>
|
||||||
|
|
||||||
|
Prepare for using libcap-ng
|
||||||
|
* configure.in: Add check for libcap-ng
|
||||||
|
* libvirt.spec.in: Build with libcap-ng on Fedora >= 12
|
||||||
|
|
||||||
Mon Jun 29 12:01:20 BST 2009 Daniel P. Berrange <berrange@redhat.com>
|
Mon Jun 29 12:01:20 BST 2009 Daniel P. Berrange <berrange@redhat.com>
|
||||||
|
|
||||||
Add HACKING doc to the website
|
Add HACKING doc to the website
|
||||||
|
48
configure.in
48
configure.in
@ -768,6 +768,49 @@ AM_CONDITIONAL([HAVE_NUMACTL], [test "$with_numactl" != "no"])
|
|||||||
AC_SUBST([NUMACTL_CFLAGS])
|
AC_SUBST([NUMACTL_CFLAGS])
|
||||||
AC_SUBST([NUMACTL_LIBS])
|
AC_SUBST([NUMACTL_LIBS])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
dnl libcap-ng
|
||||||
|
AC_ARG_WITH([capng],
|
||||||
|
[ --with-capng use libcap-ng to reduce libvirtd privileges],
|
||||||
|
[],
|
||||||
|
[with_capng=check])
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl This check looks for 'capng_updatev' since that was
|
||||||
|
dnl introduced in 0.4.0 release which need as minimum
|
||||||
|
dnl
|
||||||
|
CAPNG_CFLAGS=
|
||||||
|
CAPNG_LIBS=
|
||||||
|
if test "$with_qemu" = "yes" -a "$with_capng" != "no"; then
|
||||||
|
old_cflags="$CFLAGS"
|
||||||
|
old_libs="$LIBS"
|
||||||
|
if test "$with_capng" = "check"; then
|
||||||
|
AC_CHECK_HEADER([cap-ng.h],[],[with_capng=no])
|
||||||
|
AC_CHECK_LIB([cap-ng], [capng_updatev],[],[with_capng=no])
|
||||||
|
if test "$with_capng" != "no"; then
|
||||||
|
with_capng="yes"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
fail=0
|
||||||
|
AC_CHECK_HEADER([cap-ng.h],[],[fail=1])
|
||||||
|
AC_CHECK_LIB([cap-ng], [capng_updatev],[],[fail=1])
|
||||||
|
test $fail = 1 &&
|
||||||
|
AC_MSG_ERROR([You must install the capng >= 0.4.0 development package in order to compile and run libvirt])
|
||||||
|
fi
|
||||||
|
CFLAGS="$old_cflags"
|
||||||
|
LIBS="$old_libs"
|
||||||
|
fi
|
||||||
|
if test "$with_capng" = "yes"; then
|
||||||
|
CAPNG_LIBS="-lcap-ng"
|
||||||
|
AC_DEFINE_UNQUOTED([HAVE_CAPNG], 1, [whether capng is available for privilege reduction])
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL([HAVE_CAPNG], [test "$with_capng" != "no"])
|
||||||
|
AC_SUBST([CAPNG_CFLAGS])
|
||||||
|
AC_SUBST([CAPNG_LIBS])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dnl virsh libraries
|
dnl virsh libraries
|
||||||
AC_CHECK_HEADERS([readline/readline.h])
|
AC_CHECK_HEADERS([readline/readline.h])
|
||||||
|
|
||||||
@ -1492,6 +1535,11 @@ AC_MSG_NOTICE([ numactl: $NUMACTL_CFLAGS $NUMACTL_LIBS])
|
|||||||
else
|
else
|
||||||
AC_MSG_NOTICE([ numactl: no])
|
AC_MSG_NOTICE([ numactl: no])
|
||||||
fi
|
fi
|
||||||
|
if test "$with_capng" = "yes" ; then
|
||||||
|
AC_MSG_NOTICE([ capng: $CAPNG_CFLAGS $CAPNG_LIBS])
|
||||||
|
else
|
||||||
|
AC_MSG_NOTICE([ capng: no])
|
||||||
|
fi
|
||||||
if test "$with_xen" = "yes" ; then
|
if test "$with_xen" = "yes" ; then
|
||||||
AC_MSG_NOTICE([ xen: $XEN_CFLAGS $XEN_LIBS])
|
AC_MSG_NOTICE([ xen: $XEN_CFLAGS $XEN_LIBS])
|
||||||
else
|
else
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
%define with_lxc 0%{!?_without_lxc:1}
|
%define with_lxc 0%{!?_without_lxc:1}
|
||||||
%define with_sasl 0%{!?_without_sasl:1}
|
%define with_sasl 0%{!?_without_sasl:1}
|
||||||
%define with_avahi 0%{!?_without_avahi:1}
|
%define with_avahi 0%{!?_without_avahi:1}
|
||||||
%define with_polkit 0%{!?_without_polkit:1}
|
# default to off
|
||||||
|
%define with_polkit 0%{!?_without_polkit:0}
|
||||||
%define with_python 0%{!?_without_python:1}
|
%define with_python 0%{!?_without_python:1}
|
||||||
%define with_libvirtd 0%{!?_without_libvirtd:1}
|
%define with_libvirtd 0%{!?_without_libvirtd:1}
|
||||||
%define with_uml 0%{!?_without_uml:1}
|
%define with_uml 0%{!?_without_uml:1}
|
||||||
@ -18,6 +19,8 @@
|
|||||||
%define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
|
%define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
|
||||||
%define with_storage_disk 0%{!?_without_storage_disk:1}
|
%define with_storage_disk 0%{!?_without_storage_disk:1}
|
||||||
%define with_numactl 0%{!?_without_numactl:1}
|
%define with_numactl 0%{!?_without_numactl:1}
|
||||||
|
# default to off
|
||||||
|
%define with_capng 0%{!?_without_capng:0}
|
||||||
|
|
||||||
# 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
|
||||||
@ -39,6 +42,10 @@
|
|||||||
%define with_xen_proxy 0
|
%define with_xen_proxy 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?fedora} >= 12
|
||||||
|
%define with_capng 0%{!?_without_capng:1}
|
||||||
|
%endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# If building on RHEL switch on the specific support
|
# If building on RHEL switch on the specific support
|
||||||
#
|
#
|
||||||
@ -166,6 +173,9 @@ BuildRequires: parted-devel
|
|||||||
# For QEMU/LXC numa info
|
# For QEMU/LXC numa info
|
||||||
BuildRequires: numactl-devel
|
BuildRequires: numactl-devel
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with_capng}
|
||||||
|
BuildRequires: capng-devel >= 0.5.0
|
||||||
|
%endif
|
||||||
Obsoletes: libvir
|
Obsoletes: libvir
|
||||||
|
|
||||||
# Fedora build root suckage
|
# Fedora build root suckage
|
||||||
|
Loading…
Reference in New Issue
Block a user