* [gentoo-commits] gentoo-x86 commit in app-emulation/libvirt: libvirt-9999.ebuild libvirt-1.2.13-r2.ebuild libvirt-1.2.14-r2.ebuild ChangeLog libvirt-1.2.13-r1.ebuild libvirt-1.2.14-r1.ebuild
@ 2015-04-19 11:07 Matthias Maier (tamiko)
0 siblings, 0 replies; only message in thread
From: Matthias Maier (tamiko) @ 2015-04-19 11:07 UTC (permalink / raw
To: gentoo-commits
tamiko 15/04/19 11:07:53
Modified: libvirt-9999.ebuild ChangeLog
Added: libvirt-1.2.13-r2.ebuild libvirt-1.2.14-r2.ebuild
Removed: libvirt-1.2.13-r1.ebuild libvirt-1.2.14-r1.ebuild
Log:
Manually create /run/libvirt/lxc on libvirtd startup (see https://bugzilla.suse.com/show_bug.cgi?id=926153)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Revision Changes Path
1.74 app-emulation/libvirt/libvirt-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?r1=1.73&r2=1.74
Index: libvirt-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- libvirt-9999.ebuild 17 Apr 2015 14:30:51 -0000 1.73
+++ libvirt-9999.ebuild 19 Apr 2015 11:07:53 -0000 1.74
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.73 2015/04/17 14:30:51 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.74 2015/04/19 11:07:53 tamiko Exp $
EAPI=5
@@ -403,6 +403,8 @@
use systemd && systemd_install_serviced \
"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+ systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
newinitd "${S}/libvirtd.init" libvirtd || die
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
1.422 app-emulation/libvirt/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.422&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.422&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?r1=1.421&r2=1.422
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- ChangeLog 17 Apr 2015 14:30:51 -0000 1.421
+++ ChangeLog 19 Apr 2015 11:07:53 -0000 1.422
@@ -1,6 +1,15 @@
# ChangeLog for app-emulation/libvirt
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.421 2015/04/17 14:30:51 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.422 2015/04/19 11:07:53 tamiko Exp $
+
+*libvirt-1.2.14-r2 (19 Apr 2015)
+*libvirt-1.2.13-r2 (19 Apr 2015)
+
+ 19 Apr 2015; Matthias Maier <tamiko@gentoo.org> +files/libvirtd.tmpfiles.conf,
+ +libvirt-1.2.13-r2.ebuild, +libvirt-1.2.14-r2.ebuild,
+ -libvirt-1.2.13-r1.ebuild, -libvirt-1.2.14-r1.ebuild, libvirt-9999.ebuild:
+ Manually create /run/libvirt/lxc on libvirtd startup (see
+ https://bugzilla.suse.com/show_bug.cgi?id=926153)
*libvirt-1.2.13-r1 (17 Apr 2015)
*libvirt-1.2.14-r1 (17 Apr 2015)
1.1 app-emulation/libvirt/libvirt-1.2.13-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-1.2.13-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-1.2.13-r2.ebuild?rev=1.1&content-type=text/plain
Index: libvirt-1.2.13-r2.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.13-r2.ebuild,v 1.1 2015/04/19 11:07:53 tamiko Exp $
EAPI=5
AUTOTOOLIZE=yes
MY_P="${P/_rc/-rc}"
inherit eutils user autotools linux-info systemd readme.gentoo
BACKPORTS=""
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
SRC_URI=""
KEYWORDS=""
SLOT="0"
else
# Versions with 4 numbers are stable updates:
if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
else
SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
fi
SRC_URI+=" ${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~x86"
SLOT="0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
DESCRIPTION="C toolkit to manipulate virtual machines"
HOMEPAGE="http://www.libvirt.org/"
LICENSE="LGPL-2.1"
IUSE="audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc \
+macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
elibc_glibc systemd"
REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
lxc? ( caps libvirtd )
openvz? ( libvirtd )
qemu? ( libvirtd )
uml? ( libvirtd )
vepa? ( macvtap )
virtualbox? ( libvirtd )
xen? ( libvirtd )
virt-network? ( libvirtd )
firewalld? ( virt-network )"
# gettext.sh command is used by the libvirt command wrappers, and it's
# non-optional, so put it into RDEPEND.
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
# package will use 3 by default. Since we don't have slot pinning in an API,
# we must go with the most recent
RDEPEND="sys-libs/readline
sys-libs/ncurses
>=net-misc/curl-7.18.0
dev-libs/libgcrypt:0
>=dev-libs/libxml2-2.7.6
dev-libs/libnl:3
>=net-libs/gnutls-1.0.25
net-libs/libssh2
sys-apps/dmidecode
>=sys-apps/util-linux-2.17
sys-devel/gettext
>=net-analyzer/netcat6-1.0-r2
app-misc/scrub
audit? ( sys-process/audit )
avahi? ( >=net-dns/avahi-0.6[dbus] )
caps? ( sys-libs/libcap-ng )
fuse? ( >=sys-fs/fuse-2.8.6 )
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
iscsi? ( sys-block/open-iscsi )
lxc? ( !systemd? ( sys-power/pm-utils ) )
lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
nfs? ( net-fs/nfs-utils )
numa? (
>sys-process/numactl-2.0.2
sys-process/numad
)
openvz? ( sys-kernel/openvz-sources )
parted? (
>=sys-block/parted-1.8[device-mapper]
sys-fs/lvm2
)
pcap? ( >=net-libs/libpcap-1.0.0 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
>=app-emulation/qemu-0.13.0
dev-libs/yajl
!systemd? ( sys-power/pm-utils )
)
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
selinux? ( >=sys-libs/libselinux-2.0.85 )
systemd? ( sys-apps/systemd )
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? ( app-emulation/xen-tools app-emulation/xen )
udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
virt-network? ( net-dns/dnsmasq[script]
>=net-firewall/iptables-1.4.10
net-misc/radvd
net-firewall/ebtables
sys-apps/iproute2[-minimal]
firewalld? ( net-firewall/firewalld )
)
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
DEPEND="${RDEPEND}
virtual/pkgconfig
app-text/xhtml1
dev-lang/perl
dev-perl/XML-XPath
dev-libs/libxslt"
DOC_CONTENTS="For the basic networking support (bridged and routed networks)
you don't need any extra software. For more complex network modes
including but not limited to NATed network, you can enable the
'virt-network' USE flag.\n\n
If you are using dnsmasq on your system, you will have
to configure /etc/dnsmasq.conf to enable the following settings:\n\n
bind-interfaces\n
interface or except-interface\n\n
Otherwise you might have issues with your existing DNS server."
LXC_CONFIG_CHECK="
~CGROUPS
~CGROUP_FREEZER
~CGROUP_DEVICE
~CGROUP_CPUACCT
~CGROUP_SCHED
~CGROUP_PERF
~BLK_CGROUP
~NET_CLS_CGROUP
~CGROUP_NET_PRIO
~CPUSETS
~RESOURCE_COUNTERS
~NAMESPACES
~UTS_NS
~IPC_NS
~PID_NS
~NET_NS
~USER_NS
~DEVPTS_MULTIPLE_INSTANCES
~VETH
~MACVLAN
~POSIX_MQUEUE
~SECURITYFS
~!GRKERNSEC_CHROOT_MOUNT
~!GRKERNSEC_CHROOT_DOUBLE
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
"
VIRTNET_CONFIG_CHECK="
~BRIDGE_NF_EBTABLES
~BRIDGE_EBT_MARK_T
~NETFILTER_ADVANCED
~NETFILTER_XT_TARGET_CHECKSUM
~NETFILTER_XT_CONNMARK
~NETFILTER_XT_MARK
"
BWLMT_CONFIG_CHECK="
~BRIDGE_EBT_T_NAT
~NET_SCH_HTB
~NET_SCH_SFQ
~NET_SCH_INGRESS
~NET_CLS_FW
~NET_CLS_U32
~NET_ACT_POLICE
"
MACVTAP_CONFIG_CHECK=" ~MACVTAP"
LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
ERROR_USER_NS="Optional depending on LXC configuration."
pkg_setup() {
enewgroup qemu 77
enewuser qemu 77 -1 -1 qemu kvm
# Some people used the masked ebuild which was not adding the qemu
# user to the kvm group originally. This results in VMs failing to
# start for some users. bug #430808
egetent group kvm | grep -q qemu
if [[ $? -ne 0 ]]; then
gpasswd -a qemu kvm
fi
# Handle specific kernel versions for different features
kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
CONFIG_CHECK=""
use fuse && CONFIG_CHECK+=" ~FUSE_FS"
use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
# Bandwidth Limiting Support
use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
if [[ -n ${CONFIG_CHECK} ]]; then
linux-info_pkg_setup
fi
}
src_prepare() {
touch "${S}/.mailmap"
if [[ ${PV} = *9999* ]]; then
# git checkouts require bootstrapping to create the configure script.
# Additionally the submodules must be cloned to the right locations
# bug #377279
./bootstrap || die "bootstrap failed"
(
git submodule status | sed 's/^[ +-]//;s/ .*//'
git hash-object bootstrap.conf
) >.git-module-status
fi
epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/patches" epatch
epatch_user
[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
# Tweak the init script
local avahi_init=
local iscsi_init=
local rbd_init=
local firewalld_init=
cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init"
use avahi && avahi_init='avahi-daemon'
use iscsi && iscsi_init='iscsid'
use rbd && rbd_init='ceph'
use firewalld && firewalld_init='need firewalld'
sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
}
src_configure() {
local myconf=""
## enable/disable daemon, otherwise client only utils
myconf+=" $(use_with libvirtd)"
## enable/disable the daemon using avahi to find VMs
myconf+=" $(use_with avahi)"
## hypervisors on the local host
myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
myconf+=" --without-xenapi"
if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
myconf+=" --with-libxl"
else
myconf+=" --without-libxl"
fi
myconf+=" $(use_with openvz)"
myconf+=" $(use_with lxc)"
if use virtualbox && has_version app-emulation/virtualbox-ose; then
myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
else
myconf+=" $(use_with virtualbox vbox)"
fi
myconf+=" $(use_with uml)"
myconf+=" $(use_with qemu)"
myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
myconf+=" $(use_with phyp)"
myconf+=" --with-esx"
myconf+=" --with-vmware"
## additional host drivers
myconf+=" $(use_with virt-network network)"
myconf+=" --with-storage-fs"
myconf+=" $(use_with lvm storage-lvm)"
myconf+=" $(use_with iscsi storage-iscsi)"
myconf+=" $(use_with parted storage-disk)"
mycond+=" $(use_with glusterfs)"
mycond+=" $(use_with glusterfs storage-gluster)"
myconf+=" $(use_with lvm storage-mpath)"
myconf+=" $(use_with rbd storage-rbd)"
myconf+=" $(use_with numa numactl)"
myconf+=" $(use_with numa numad)"
myconf+=" $(use_with selinux)"
myconf+=" $(use_with fuse)"
# udev for device support details
myconf+=" $(use_with udev)"
myconf+=" --without-hal"
# linux capability support so we don't need privileged accounts
myconf+=" $(use_with caps capng)"
## auth stuff
myconf+=" $(use_with policykit polkit)"
myconf+=" $(use_with sasl)"
# network bits
myconf+=" $(use_with macvtap)"
myconf+=" $(use_with pcap libpcap)"
myconf+=" $(use_with vepa virtualport)"
myconf+=" $(use_with firewalld)"
## other
myconf+=" $(use_enable nls)"
# user privilege bits fir qemu/kvm
if use caps; then
myconf+=" --with-qemu-user=qemu"
myconf+=" --with-qemu-group=qemu"
else
myconf+=" --with-qemu-user=root"
myconf+=" --with-qemu-group=root"
fi
# audit support
myconf+=" $(use_with audit)"
# wireshark dissector
myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
## stuff we don't yet support
myconf+=" --without-netcf"
# locking support
myconf+=" --without-sanlock"
# systemd unit files
myconf+=" $(use_with systemd systemd-daemon)"
use systemd && myconf+=" --with-init-script=systemd"
# this is a nasty trick to work around the problem in bug
# #275073. The reason why we don't solve this properly is that
# it'll require us to rebuild autotools (and we don't really want
# to do that right now). The proper solution has been sent
# upstream and should hopefully land in 0.7.7, in the mean time,
# mime the same functionality with this.
case ${CHOST} in
*cygwin* | *mingw* )
;;
*)
ac_cv_prog_WINDRES=no
;;
esac
econf \
${myconf} \
--disable-static \
--disable-werror \
--with-remote \
--docdir=/usr/share/doc/${PF} \
--localstatedir=/var
if [[ ${PV} = *9999* ]]; then
# Restore gnulib's config.sub and config.guess
# bug #377279
(cd .gnulib && git reset --hard > /dev/null)
fi
}
src_test() {
# Explicitly allow parallel build of tests
export VIR_TEST_DEBUG=1
HOME="${T}" emake check || die "tests failed"
}
src_install() {
emake install \
DESTDIR="${D}" \
HTML_DIR=/usr/share/doc/${PF}/html \
DOCS_DIR=/usr/share/doc/${PF} \
EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
|| die "emake install failed"
find "${D}" -name '*.la' -delete || die
# Remove bogus, empty directories. They are either not used, or
# libvirtd is able to create them on demand
rm -rf "${D}"/etc/sysconf
rm -rf "${D}"/var/cache
rm -rf "${D}"/var/run
rm -rf "${D}"/var/log
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
use systemd && systemd_install_serviced \
"${FILESDIR}"/libvirtd.service.conf libvirtd.service
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
newinitd "${S}/libvirtd.init" libvirtd || die
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
readme.gentoo_create_doc
}
pkg_preinst() {
# we only ever want to generate this once
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
fi
# We really don't want to use or support old PolicyKit cause it
# screws with the new polkit integration
if has_version sys-auth/policykit; then
rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
fi
# Only sysctl files ending in .conf work
dodir /etc/sysctl.d
mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
}
pkg_postinst() {
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
fi
if ! use policykit; then
elog "To allow normal users to connect to libvirtd you must change the"
elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
fi
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
readme.gentoo_print_elog
if use caps && use qemu; then
elog "libvirt will now start qemu/kvm VMs with non-root privileges."
elog "Ensure any resources your VMs use are accessible by qemu:qemu"
fi
if [[ -n "${REPLACING_VERSIONS}" ]]; then
elog ""
elog "The systemd service-file configuration under /etc/sysconfig has"
elog "been removed. Please use"
elog " /etc/systemd/system/libvirtd.service.d/00gentoo.conf"
elog "to control the '--listen' parameter for libvirtd. The configuration"
elog "for the libvirt-guests.service is now found under"
elog " /etc/libvirt/libvirt-guests.conf"
elog "The openrc configuration has not been changed. Thus no action is"
elog "required for the openrc service manager."
elog ""
fi
}
1.1 app-emulation/libvirt/libvirt-1.2.14-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild?rev=1.1&content-type=text/plain
Index: libvirt-1.2.14-r2.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild,v 1.1 2015/04/19 11:07:53 tamiko Exp $
EAPI=5
AUTOTOOLIZE=yes
MY_P="${P/_rc/-rc}"
inherit eutils user autotools linux-info systemd readme.gentoo
BACKPORTS=""
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
SRC_URI=""
KEYWORDS=""
SLOT="0"
else
# Versions with 4 numbers are stable updates:
if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
else
SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
fi
SRC_URI+=" ${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~x86"
SLOT="0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
DESCRIPTION="C toolkit to manipulate virtual machines"
HOMEPAGE="http://www.libvirt.org/"
LICENSE="LGPL-2.1"
# TODO: Reenable IUSE wireshark-plugins
IUSE="audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc \
+macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc systemd"
REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
lxc? ( caps libvirtd )
openvz? ( libvirtd )
qemu? ( libvirtd )
uml? ( libvirtd )
vepa? ( macvtap )
virtualbox? ( libvirtd )
xen? ( libvirtd )
virt-network? ( libvirtd )
firewalld? ( virt-network )"
# gettext.sh command is used by the libvirt command wrappers, and it's
# non-optional, so put it into RDEPEND.
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
# package will use 3 by default. Since we don't have slot pinning in an API,
# we must go with the most recent
# wireshark-plugins? ( net-analyzer/wireshark:= )
RDEPEND="sys-libs/readline
sys-libs/ncurses
>=net-misc/curl-7.18.0
dev-libs/libgcrypt:0
>=dev-libs/libxml2-2.7.6
dev-libs/libnl:3
>=net-libs/gnutls-1.0.25
net-libs/libssh2
sys-apps/dmidecode
>=sys-apps/util-linux-2.17
sys-devel/gettext
>=net-analyzer/netcat6-1.0-r2
app-misc/scrub
audit? ( sys-process/audit )
avahi? ( >=net-dns/avahi-0.6[dbus] )
caps? ( sys-libs/libcap-ng )
fuse? ( >=sys-fs/fuse-2.8.6 )
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
iscsi? ( sys-block/open-iscsi )
lxc? ( !systemd? ( sys-power/pm-utils ) )
lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
nfs? ( net-fs/nfs-utils )
numa? (
>sys-process/numactl-2.0.2
sys-process/numad
)
openvz? ( sys-kernel/openvz-sources )
parted? (
>=sys-block/parted-1.8[device-mapper]
sys-fs/lvm2
)
pcap? ( >=net-libs/libpcap-1.0.0 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
>=app-emulation/qemu-0.13.0
dev-libs/yajl
!systemd? ( sys-power/pm-utils )
)
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
selinux? ( >=sys-libs/libselinux-2.0.85 )
systemd? ( sys-apps/systemd )
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
xen? ( app-emulation/xen-tools app-emulation/xen )
udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
virt-network? ( net-dns/dnsmasq[script]
>=net-firewall/iptables-1.4.10
net-misc/radvd
net-firewall/ebtables
sys-apps/iproute2[-minimal]
firewalld? ( net-firewall/firewalld )
)
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
DEPEND="${RDEPEND}
virtual/pkgconfig
app-text/xhtml1
dev-lang/perl
dev-perl/XML-XPath
dev-libs/libxslt"
DOC_CONTENTS="For the basic networking support (bridged and routed networks)
you don't need any extra software. For more complex network modes
including but not limited to NATed network, you can enable the
'virt-network' USE flag.\n\n
If you are using dnsmasq on your system, you will have
to configure /etc/dnsmasq.conf to enable the following settings:\n\n
bind-interfaces\n
interface or except-interface\n\n
Otherwise you might have issues with your existing DNS server."
LXC_CONFIG_CHECK="
~CGROUPS
~CGROUP_FREEZER
~CGROUP_DEVICE
~CGROUP_CPUACCT
~CGROUP_SCHED
~CGROUP_PERF
~BLK_CGROUP
~NET_CLS_CGROUP
~CGROUP_NET_PRIO
~CPUSETS
~RESOURCE_COUNTERS
~NAMESPACES
~UTS_NS
~IPC_NS
~PID_NS
~NET_NS
~USER_NS
~DEVPTS_MULTIPLE_INSTANCES
~VETH
~MACVLAN
~POSIX_MQUEUE
~SECURITYFS
~!GRKERNSEC_CHROOT_MOUNT
~!GRKERNSEC_CHROOT_DOUBLE
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
"
VIRTNET_CONFIG_CHECK="
~BRIDGE_NF_EBTABLES
~BRIDGE_EBT_MARK_T
~NETFILTER_ADVANCED
~NETFILTER_XT_TARGET_CHECKSUM
~NETFILTER_XT_CONNMARK
~NETFILTER_XT_MARK
"
BWLMT_CONFIG_CHECK="
~BRIDGE_EBT_T_NAT
~NET_SCH_HTB
~NET_SCH_SFQ
~NET_SCH_INGRESS
~NET_CLS_FW
~NET_CLS_U32
~NET_ACT_POLICE
"
MACVTAP_CONFIG_CHECK=" ~MACVTAP"
LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
ERROR_USER_NS="Optional depending on LXC configuration."
pkg_setup() {
enewgroup qemu 77
enewuser qemu 77 -1 -1 qemu kvm
# Some people used the masked ebuild which was not adding the qemu
# user to the kvm group originally. This results in VMs failing to
# start for some users. bug #430808
egetent group kvm | grep -q qemu
if [[ $? -ne 0 ]]; then
gpasswd -a qemu kvm
fi
# Handle specific kernel versions for different features
kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
CONFIG_CHECK=""
use fuse && CONFIG_CHECK+=" ~FUSE_FS"
use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
# Bandwidth Limiting Support
use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
if [[ -n ${CONFIG_CHECK} ]]; then
linux-info_pkg_setup
fi
}
src_prepare() {
touch "${S}/.mailmap"
if [[ ${PV} = *9999* ]]; then
# git checkouts require bootstrapping to create the configure script.
# Additionally the submodules must be cloned to the right locations
# bug #377279
./bootstrap || die "bootstrap failed"
(
git submodule status | sed 's/^[ +-]//;s/ .*//'
git hash-object bootstrap.conf
) >.git-module-status
fi
epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/patches" epatch
epatch_user
[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
# Tweak the init script
local avahi_init=
local iscsi_init=
local rbd_init=
local firewalld_init=
cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init"
use avahi && avahi_init='avahi-daemon'
use iscsi && iscsi_init='iscsid'
use rbd && rbd_init='ceph'
use firewalld && firewalld_init='need firewalld'
sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
}
src_configure() {
local myconf=""
## enable/disable daemon, otherwise client only utils
myconf+=" $(use_with libvirtd)"
## enable/disable the daemon using avahi to find VMs
myconf+=" $(use_with avahi)"
## hypervisors on the local host
myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
myconf+=" --without-xenapi"
if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
myconf+=" --with-libxl"
else
myconf+=" --without-libxl"
fi
myconf+=" $(use_with openvz)"
myconf+=" $(use_with lxc)"
if use virtualbox && has_version app-emulation/virtualbox-ose; then
myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
else
myconf+=" $(use_with virtualbox vbox)"
fi
myconf+=" $(use_with uml)"
myconf+=" $(use_with qemu)"
myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
myconf+=" $(use_with phyp)"
myconf+=" --with-esx"
myconf+=" --with-vmware"
## additional host drivers
myconf+=" $(use_with virt-network network)"
myconf+=" --with-storage-fs"
myconf+=" $(use_with lvm storage-lvm)"
myconf+=" $(use_with iscsi storage-iscsi)"
myconf+=" $(use_with parted storage-disk)"
mycond+=" $(use_with glusterfs)"
mycond+=" $(use_with glusterfs storage-gluster)"
myconf+=" $(use_with lvm storage-mpath)"
myconf+=" $(use_with rbd storage-rbd)"
myconf+=" $(use_with numa numactl)"
myconf+=" $(use_with numa numad)"
myconf+=" $(use_with selinux)"
myconf+=" $(use_with fuse)"
# udev for device support details
myconf+=" $(use_with udev)"
myconf+=" --without-hal"
# linux capability support so we don't need privileged accounts
myconf+=" $(use_with caps capng)"
## auth stuff
myconf+=" $(use_with policykit polkit)"
myconf+=" $(use_with sasl)"
# network bits
myconf+=" $(use_with macvtap)"
myconf+=" $(use_with pcap libpcap)"
myconf+=" $(use_with vepa virtualport)"
myconf+=" $(use_with firewalld)"
## other
myconf+=" $(use_enable nls)"
# user privilege bits fir qemu/kvm
if use caps; then
myconf+=" --with-qemu-user=qemu"
myconf+=" --with-qemu-group=qemu"
else
myconf+=" --with-qemu-user=root"
myconf+=" --with-qemu-group=root"
fi
# audit support
myconf+=" $(use_with audit)"
# wireshark dissector
# myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
## stuff we don't yet support
myconf+=" --without-netcf"
# locking support
myconf+=" --without-sanlock"
# systemd unit files
myconf+=" $(use_with systemd systemd-daemon)"
use systemd && myconf+=" --with-init-script=systemd"
# this is a nasty trick to work around the problem in bug
# #275073. The reason why we don't solve this properly is that
# it'll require us to rebuild autotools (and we don't really want
# to do that right now). The proper solution has been sent
# upstream and should hopefully land in 0.7.7, in the mean time,
# mime the same functionality with this.
case ${CHOST} in
*cygwin* | *mingw* )
;;
*)
ac_cv_prog_WINDRES=no
;;
esac
econf \
${myconf} \
--disable-static \
--disable-werror \
--with-remote \
--docdir=/usr/share/doc/${PF} \
--localstatedir=/var
if [[ ${PV} = *9999* ]]; then
# Restore gnulib's config.sub and config.guess
# bug #377279
(cd .gnulib && git reset --hard > /dev/null)
fi
}
src_test() {
# Explicitly allow parallel build of tests
export VIR_TEST_DEBUG=1
HOME="${T}" emake check || die "tests failed"
}
src_install() {
emake install \
DESTDIR="${D}" \
HTML_DIR=/usr/share/doc/${PF}/html \
DOCS_DIR=/usr/share/doc/${PF} \
EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
|| die "emake install failed"
find "${D}" -name '*.la' -delete || die
# Remove bogus, empty directories. They are either not used, or
# libvirtd is able to create them on demand
rm -rf "${D}"/etc/sysconf
rm -rf "${D}"/var/cache
rm -rf "${D}"/var/run
rm -rf "${D}"/var/log
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
use systemd && systemd_install_serviced \
"${FILESDIR}"/libvirtd.service.conf libvirtd.service
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
newinitd "${S}/libvirtd.init" libvirtd || die
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
readme.gentoo_create_doc
}
pkg_preinst() {
# we only ever want to generate this once
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
fi
# We really don't want to use or support old PolicyKit cause it
# screws with the new polkit integration
if has_version sys-auth/policykit; then
rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
fi
# Only sysctl files ending in .conf work
dodir /etc/sysctl.d
mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
}
pkg_postinst() {
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
fi
if ! use policykit; then
elog "To allow normal users to connect to libvirtd you must change the"
elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
fi
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
readme.gentoo_print_elog
if use caps && use qemu; then
elog "libvirt will now start qemu/kvm VMs with non-root privileges."
elog "Ensure any resources your VMs use are accessible by qemu:qemu"
fi
if [[ -n "${REPLACING_VERSIONS}" ]]; then
elog ""
elog "The systemd service-file configuration under /etc/sysconfig has"
elog "been removed. Please use"
elog " /etc/systemd/system/libvirtd.service.d/00gentoo.conf"
elog "to control the '--listen' parameter for libvirtd. The configuration"
elog "for the libvirt-guests.service is now found under"
elog " /etc/libvirt/libvirt-guests.conf"
elog "The openrc configuration has not been changed. Thus no action is"
elog "required for the openrc service manager."
elog ""
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-19 11:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-19 11:07 [gentoo-commits] gentoo-x86 commit in app-emulation/libvirt: libvirt-9999.ebuild libvirt-1.2.13-r2.ebuild libvirt-1.2.14-r2.ebuild ChangeLog libvirt-1.2.13-r1.ebuild libvirt-1.2.14-r1.ebuild Matthias Maier (tamiko)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox