diff options
| -rw-r--r-- | app-emulation/libvirt/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emulation/libvirt/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 65 |
3 files changed, 54 insertions, 20 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index 6f2dbbecca34..8b007e865e0b 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emulation/libvirt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.228 2012/10/30 05:17:42 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.229 2012/10/30 05:49:45 cardoe Exp $ + + 30 Oct 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-9999.ebuild: + Update the live ebuild. 30 Oct 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.10.2.1.ebuild, files/libvirtd.init-r10: diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index ed1b022a634f..b753ef4dedd6 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -11,6 +11,6 @@ DIST libvirt-0.9.13.tar.gz 20276757 SHA256 d124e9915c88c195da9c008a6d855e53e555d EBUILD libvirt-0.10.2-r3.ebuild 11044 SHA256 b355de68a9d205fae91e14b6daba5227cd844589228cbecea47226ea8f782250 SHA512 79e05098333cdbfb1b0f34b23087d1ccca70e7b8c3f802c4d1ec77be94df9186e747271b4ce9c9ffd95d65d3d103be3a800355de47b7244039fbeb3a0fad1d4f WHIRLPOOL 63edd30d248d20bbcd66ffac0cedf93c8ec27899ab15d78413afc50e227ca207500f8349f1c88588650704856fae363d455719486c0565933c9e3e4948ad8f6b EBUILD libvirt-0.10.2.1.ebuild 11499 SHA256 5caed3fd6effce7b7eda3a9d1439011ba317039ab8c124e88955dbb895e36f1a SHA512 27de896e7d4d5fc0633d2d6b32563a83ade23104b2c113a48bc9edefca199140a5b7e1a5a3f020d6d95aa464620de3342148a3f1d181b905798ec5b92f51216e WHIRLPOOL df8577e91fa8eee2b83da0bf3d45122dc7b6782793cc0ee444052cca6983c42e57e2b64788e2af021ef31f3595c210e4bab3ec53a5db504534c22f5ad39a650a EBUILD libvirt-0.9.13-r1.ebuild 10769 SHA256 c04a4fbd49ca663eb2762247629a3a84aa46cdfe0b49e9098522b8353572d334 SHA512 a818f43e63cb6aa409e9a8ecad6d1ad718151e758533bc2cd5292abbf5ac943dc980fbbee3b241401e2dc2fcf6379f79109bb156afd1f30f4df96ff6543e4c82 WHIRLPOOL 5e2c29bc51a9b5e48ce81eb5f2a3fa47e3d57ea3361ab7260dc5225b545647ab1b65c759fce3edb0a814de6df8f285500c6f0d8a1ceb33e0a0b262618803f763 -EBUILD libvirt-9999.ebuild 10353 SHA256 ff2ddc2632f5b5238e877091ce98cd9ee265fee1bf34c8be73174eb651269fd4 SHA512 ab43bd2b15bf6773cd790dd65a736163031073fb924ed07eff8da818499af53b83996af4eb731c713380bcf6f1126191893fe47730e149808d98d2e6206c4657 WHIRLPOOL b0f320dec564d2d0d490bbc05f860864f894716cc2f3f49eb8dd86696fadb77f613322e17983a4968b3a9950af16652a6f68be75a0a08f55494a3fcb5a32a07d -MISC ChangeLog 44746 SHA256 08d8e5e74f9f1b8931d7c8c76711c8378a8cb281f36645b87a858d8a275c26ac SHA512 261ff9588d015611ec995402b1562f86d49642f8c97483bd42f7ef5f5165f8cec7c0acf7dc12514a54222681e1a063fd148f67282ac2a5817a1f066f247328fc WHIRLPOOL b925259d58e30f1eec9e2a75c89287357787f623c504c03175bfcc5668ce53057269a50eac76f0a7f4a63af9ef1dc1b036529a821a262ef215c98393648640e3 +EBUILD libvirt-9999.ebuild 11496 SHA256 f3ba4144d2ee3f3a8f96eef56ad8e8067a70635ccaa51efc2d492f5f3d9e80ba SHA512 c4217a71a20a107860822a488ee7812433207302e5316eba8f34e8bef691f499d8911629ace5fdf5af455744e238acd399ef0e28e8da0dd0397b428c6165dcd8 WHIRLPOOL c056508c4fcabacc18a1c73ebabe0e0bde8c3506e56780404bd5b4e72ee5f8571835a0d10efb0fc0dd9f30f95eec7cd58a3970e80a43ab31ec5d594ebb7b412c +MISC ChangeLog 44844 SHA256 a93279909cb4655083b4292ad106f9cb92af329e042e55e702b76b5f3c6cd4de SHA512 fff41a2a96daaaddec5762e197a5ca5eaab8e1f8431a2da846f6b43a378661d186c636b6fd2a9ddfffd366321b264a77851b0dda00cb6c5408659b271e3cedba WHIRLPOOL 75a1fc7194c623ecae536fdff11f15942b4c82e8fa0f03cc47cebb5ce9daffd71ba849c7397f7a9227370632c4f0f042d8664164eb6cee8e999c9c84bd108a84 MISC metadata.xml 3307 SHA256 677bb13ab5f99946bd4dce20bfe9c26739fd312fda5671f7080839ffc048f957 SHA512 b9dd812a97f3d698089fdd8314bab93586e9d954653f3fe90672e636c51de097bb7d211f25bbd706d71029b8f68d31cfe053b3ee2ddf035fb55ad2b3a5029089 WHIRLPOOL 707d7c1bff3c8f69fa3f3ad1dbc14c01ae313bbc16d1a27be8de314f351c1bcf8ab192eb131bb833e274dcce50f2f862f13ff784f151ab6dd8c38ea07363a0e2 diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index bc584ae1578e..e43760ee919c 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2012 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.41 2012/10/12 22:53:59 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.42 2012/10/30 05:49:45 cardoe Exp $ EAPI=4 -#BACKPORTS=1 -#AUTOTOOLIZE=yes +#BACKPORTS=85e8c146 +AUTOTOOLIZE=yes MY_P="${P/_rc/-rc}" @@ -22,10 +22,10 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" KEYWORDS="" else - SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz - ftp://libvirt.org/libvirt/${MY_P}.tar.gz + SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz + ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz ${BACKPORTS:+ - http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.bz2}" + http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}" KEYWORDS="~amd64 ~x86" fi S="${WORKDIR}/${P%_rc*}" @@ -35,8 +35,8 @@ HOMEPAGE="http://www.libvirt.org/" LICENSE="LGPL-2.1" SLOT="0" IUSE="audit avahi +caps debug iscsi +libvirtd lvm +lxc +macvtap nfs \ - nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \ - uml +vepa virtualbox virt-network xen elibc_glibc" + nls numa openvz parted pcap phyp policykit python qemu rbd sasl \ + selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc" REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) @@ -49,13 +49,14 @@ REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) # 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 1.1 by default +# 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 >=dev-libs/libxml2-2.7.6 - dev-libs/libnl:1.1 + dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode @@ -82,10 +83,11 @@ RDEPEND="sys-libs/readline pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( - || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) + >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) + rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) @@ -101,6 +103,7 @@ RDEPEND="sys-libs/readline DEPEND="${RDEPEND} virtual/pkgconfig app-text/xhtml1 + dev-libs/libxslt =dev-lang/python-2*" LXC_CONFIG_CHECK=" @@ -110,13 +113,11 @@ LXC_CONFIG_CHECK=" ~CPUSETS ~CGROUP_CPUACCT ~RESOURCE_COUNTERS - ~CGROUP_MEM_RES_CTLR ~CGROUP_SCHED ~BLK_CGROUP ~NAMESPACES ~UTS_NS ~IPC_NS - ~USER_NS ~PID_NS ~NET_NS ~DEVPTS_MULTIPLE_INSTANCES @@ -145,6 +146,19 @@ 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 5 && LXC_CONFIG_CHECK+=" ~USER_NS" + kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" || \ + LXC_CONFIG_CHECK+=" ~MEMCG" + CONFIG_CHECK="" use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}" use macvtap && CONFIG_CHECK+="${MACVTAP}" @@ -155,6 +169,7 @@ pkg_setup() { } src_prepare() { + touch "${S}/.mailmap" [[ -n ${BACKPORTS} ]] && \ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ epatch @@ -174,6 +189,19 @@ src_prepare() { epatch_user [[ -n ${AUTOTOOLIZE} ]] && eautoreconf + + # Tweak the init script + local avahi_init= + local iscsi_init= + local rbd_init= + cp "${FILESDIR}/libvirtd.init-r10" "${S}/libvirtd.init" + use avahi && avahi_init='avahi-daemon' + use iscsi && iscsi_init='iscsid' + use rbd && rbd_init='ceph' + + 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() { @@ -192,7 +220,6 @@ src_configure() { # leave it automagic as it depends on the version of xen used. use xen || myconf+=" --without-libxl" use xen || myconf+=" --without-xenapi" - myconf="${myconf} $(use_with openvz)" myconf="${myconf} $(use_with lxc)" if use virtualbox && has_version app-emulation/virtualbox-ose; then @@ -205,6 +232,7 @@ src_configure() { myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP myconf="${myconf} $(use_with phyp)" myconf="${myconf} --with-esx" + myconf="${myconf} --with-vmware" ## additional host drivers myconf="${myconf} $(use_with virt-network network)" @@ -213,7 +241,7 @@ src_configure() { myconf="${myconf} $(use_with iscsi storage-iscsi)" myconf="${myconf} $(use_with parted storage-disk)" myconf="${myconf} $(use_with lvm storage-mpath)" - #myconf="${myconf} --without-storage-rbd" + myconf="${myconf} $(use_with rbd storage-rbd)" myconf="${myconf} $(use_with numa numactl)" myconf="${myconf} $(use_with numa numad)" myconf="${myconf} $(use_with selinux)" @@ -258,6 +286,9 @@ src_configure() { # locking support myconf="${myconf} --without-sanlock" + # DBus access to iptables/ebtables and friends + myconf="${myconf} --without-firewalld" + # 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 @@ -304,8 +335,8 @@ src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - newinitd "${FILESDIR}/libvirtd.init-r9" libvirtd || die - newconfd "${FILESDIR}/libvirtd.confd-r3" libvirtd || die + newinitd "${S}/libvirtd.init" libvirtd || die + newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die keepdir /var/lib/libvirt/images } |