diff options
author | Lance Albertson <ramereth@gentoo.org> | 2008-07-08 22:57:30 +0000 |
---|---|---|
committer | Lance Albertson <ramereth@gentoo.org> | 2008-07-08 22:57:30 +0000 |
commit | e29d99e4febc80e26741d7993d28dc4de52e28d7 (patch) | |
tree | 4657c23b846e3dcad78c983eb85f3891d0288a90 /app-emulation | |
parent | Version bump. Provides a jdbc4 driver that is always built but optional at ru... (diff) | |
download | gentoo-2-e29d99e4febc80e26741d7993d28dc4de52e28d7.tar.gz gentoo-2-e29d99e4febc80e26741d7993d28dc4de52e28d7.tar.bz2 gentoo-2-e29d99e4febc80e26741d7993d28dc4de52e28d7.zip |
bump libvirt, add init scripts, add myself as maintainer, new patch to fix issue with kvm
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/libvirt/ChangeLog | 12 | ||||
-rw-r--r-- | app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch | 27 | ||||
-rw-r--r-- | app-emulation/libvirt/files/libvirtd.confd | 8 | ||||
-rwxr-xr-x | app-emulation/libvirt/files/libvirtd.init | 14 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-0.4.4.ebuild | 69 | ||||
-rw-r--r-- | app-emulation/libvirt/metadata.xml | 4 |
6 files changed, 133 insertions, 1 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index 41a82c77548d..c5e642bdc807 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-emulation/libvirt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.11 2008/05/15 10:23:52 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.12 2008/07/08 22:57:29 ramereth Exp $ + +*libvirt-0.4.4 (08 Jul 2008) + + 08 Jul 2008; Lance Albertson <ramereth@gentoo.org> + +files/libvirt-0.4.4-kvm-cdrom-fix.patch, +files/libvirtd.confd, + +files/libvirtd.init, metadata.xml, +libvirt-0.4.4.ebuild: + * Bump version + * Add init scripts for libvirtd + * Add kvm-cdrom-fix patch + * Add myself as a maintainer 15 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml: Add myself as maintainer. diff --git a/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch b/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch new file mode 100644 index 000000000000..a073f062bc6b --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-0.4.4-kvm-cdrom-fix.patch @@ -0,0 +1,27 @@ +diff -urN libvirt-0.4.4/src/qemu_conf.c libvirt-0.4.4-new/src/qemu_conf.c +--- libvirt-0.4.4/src/qemu_conf.c 2008-06-19 13:15:02.000000000 +0000 ++++ libvirt-0.4.4-new/src/qemu_conf.c 2008-07-02 20:47:51.000000000 +0000 +@@ -2612,11 +2612,18 @@ + break; + } + +- snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d%s", +- disk->src, qemudBusIdToName(disk->bus, 1), +- media ? media : "", +- idx, +- bootable ? ",boot=on" : ""); ++ if (disk->device == QEMUD_DISK_CDROM) { ++ snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d", ++ disk->src, qemudBusIdToName(disk->bus, 1), ++ media ? media : "", ++ idx); ++ } else { ++ snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d%s", ++ disk->src, qemudBusIdToName(disk->bus, 1), ++ media ? media : "", ++ idx, ++ bootable ? ",boot=on" : ""); ++ } + + ADD_ARG_LIT("-drive"); + ADD_ARG_LIT(opt); diff --git a/app-emulation/libvirt/files/libvirtd.confd b/app-emulation/libvirt/files/libvirtd.confd new file mode 100644 index 000000000000..c41e3c9aad1a --- /dev/null +++ b/app-emulation/libvirt/files/libvirtd.confd @@ -0,0 +1,8 @@ +# /etc/conf.d/libvirtd + +# You may want to add '--listen' to have libvirtd listen for tcp/ip connections +# if you want to use libvirt for remote control + +# Please consult 'libvirtd --help' for more options + +#LIBVIRTD_OPTS="--listen" diff --git a/app-emulation/libvirt/files/libvirtd.init b/app-emulation/libvirt/files/libvirtd.init new file mode 100755 index 000000000000..aaf6f0ecd97d --- /dev/null +++ b/app-emulation/libvirt/files/libvirtd.init @@ -0,0 +1,14 @@ +#!/sbin/runscript + +start() { + ebegin "Starting libvirtd" + start-stop-daemon --start --quiet --exec /usr/sbin/libvirtd -- \ + -d --pid-file /var/run/libvirtd.pid ${LIBVIRTD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping libvirtd" + start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pid-file=/var/run/libvirtd.pid + eend $? +} diff --git a/app-emulation/libvirt/libvirt-0.4.4.ebuild b/app-emulation/libvirt/libvirt-0.4.4.ebuild new file mode 100644 index 000000000000..81c28b0b52b3 --- /dev/null +++ b/app-emulation/libvirt/libvirt-0.4.4.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.4.4.ebuild,v 1.1 2008/07/08 22:57:29 ramereth Exp $ + +inherit eutils + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="http://www.libvirt.org/" +SRC_URI="http://libvirt.org/sources/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="avahi iscsi lvm openvz parted qemu sasl selinux xen" #policykit is in package.mask + +DEPEND="sys-libs/readline + sys-libs/ncurses + >=dev-libs/libxml2-2.5 + >=net-libs/gnutls-1.0.25 + dev-lang/python + sys-fs/sysfsutils + avahi? ( >=net-dns/avahi-0.6 ) + iscsi? ( sys-block/open-iscsi ) + lvm? ( sys-fs/lvm2 ) + openvz? ( sys-kernel/openvz-sources ) + parted? ( >=sys-apps/parted-1.8 ) + qemu? ( app-emulation/qemu ) + sasl? ( dev-libs/cyrus-sasl ) + selinux? ( sys-libs/libselinux ) + xen? ( app-emulation/xen-tools app-emulation/xen ) + " + #policykit? ( >=sys-auth/policykit-0.6 ) + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/"${P}"-kvm-cdrom-fix.patch +} + +pkg_setup() { + if ! use qemu && ! use xen && ! use openvz; then + local msg="You must enable one of these USE flags: qemu xen openvz" + eerror "$msg" + die "$msg" + fi +} + +src_compile() { + econf \ + $(use_with avahi) \ + $(use_with iscsi storage-iscsi) \ + $(use_with lvm storage-lvm) \ + $(use_with openvz) \ + $(use_with parted storage-disk) \ + $(use_with qemu) \ + $(use_with sasl) \ + $(use_with selinux) \ + $(use_with xen) \ + --disable-iptables-lokkit \ + || die "econf failed" + #$(use_with policykit) \ + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die + mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python} + newinitd "${FILESDIR}"/libvirtd.init libvirtd + newconfd "${FILESDIR}"/libvirtd.confd libvirtd +} diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml index 849d5495f8c7..a892205aca4d 100644 --- a/app-emulation/libvirt/metadata.xml +++ b/app-emulation/libvirt/metadata.xml @@ -6,4 +6,8 @@ <email>dberkholz@gentoo.org</email> <name>Donnie Berkholz</name> </maintainer> + <maintainer> + <email>ramereth@gentoo.org</email> + <name>Lance Albertson</name> + </maintainer> </pkgmetadata> |