diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2010-08-12 08:41:58 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2010-08-12 08:41:58 +0000 |
commit | a3e89f7dc488877be509512efa60356147104232 (patch) | |
tree | 50acafce44fa77f867b3249e86e89d5d0b352cab /app-emulation | |
parent | Add support for SMTP via libesmtp. Thanks to Ultrabug for report and testing. (diff) | |
download | gentoo-2-a3e89f7dc488877be509512efa60356147104232.tar.gz gentoo-2-a3e89f7dc488877be509512efa60356147104232.tar.bz2 gentoo-2-a3e89f7dc488877be509512efa60356147104232.zip |
Initial commit (bug #332145), ebuild is a clone of qemu-kvm.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
6 files changed, 301 insertions, 0 deletions
diff --git a/app-emulation/qemu-kvm-spice/ChangeLog b/app-emulation/qemu-kvm-spice/ChangeLog new file mode 100644 index 000000000000..75e43a2be84a --- /dev/null +++ b/app-emulation/qemu-kvm-spice/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for app-emulation/qemu-kvm-spice +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm-spice/ChangeLog,v 1.1 2010/08/12 08:41:58 dev-zero Exp $ + +*qemu-kvm-spice-14.9999 (12 Aug 2010) + + 12 Aug 2010; Tiziano Müller <dev-zero@gentoo.org> + +files/qemu-0.11.0-mips64-user-fix.patch, + +files/qemu-kvm-0.12.3-include-madvise-defines.patch, + +qemu-kvm-spice-14.9999.ebuild, +files/qemu-kvm, +metadata.xml: + Initial commit (bug #332145), ebuild is a clone of qemu-kvm. + diff --git a/app-emulation/qemu-kvm-spice/files/qemu-0.11.0-mips64-user-fix.patch b/app-emulation/qemu-kvm-spice/files/qemu-0.11.0-mips64-user-fix.patch new file mode 100644 index 000000000000..c069f898c12d --- /dev/null +++ b/app-emulation/qemu-kvm-spice/files/qemu-0.11.0-mips64-user-fix.patch @@ -0,0 +1,11 @@ +--- qemu-0.11.0.orig/linux-user/main.c 2009-10-23 02:19:57.000000000 +0200 ++++ qemu-0.11.0/linux-user/main.c 2009-10-23 02:47:09.000000000 +0200 +@@ -1469,6 +1469,8 @@ + + #ifdef TARGET_MIPS + ++#define TARGET_QEMU_ESIGRETURN 255 ++ + #define MIPS_SYS(name, args) args, + + static const uint8_t mips_syscall_args[] = { diff --git a/app-emulation/qemu-kvm-spice/files/qemu-kvm b/app-emulation/qemu-kvm-spice/files/qemu-kvm new file mode 100644 index 000000000000..844147d568c2 --- /dev/null +++ b/app-emulation/qemu-kvm-spice/files/qemu-kvm @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/qemu-system-x86_64 --enable-kvm "$@" diff --git a/app-emulation/qemu-kvm-spice/files/qemu-kvm-0.12.3-include-madvise-defines.patch b/app-emulation/qemu-kvm-spice/files/qemu-kvm-0.12.3-include-madvise-defines.patch new file mode 100644 index 000000000000..c50c7172f3c6 --- /dev/null +++ b/app-emulation/qemu-kvm-spice/files/qemu-kvm-0.12.3-include-madvise-defines.patch @@ -0,0 +1,12 @@ +--- exec.c 2010-02-26 03:34:00.000000000 +0100 ++++ exec.c.new 2010-04-03 15:31:53.000000000 +0200 +@@ -22,6 +22,9 @@ + #else + #include <sys/types.h> + #include <sys/mman.h> ++#ifndef MADV_MERGEABLE ++#include <asm/mman.h> ++#endif + #endif + #include <stdlib.h> + #include <stdio.h> diff --git a/app-emulation/qemu-kvm-spice/metadata.xml b/app-emulation/qemu-kvm-spice/metadata.xml new file mode 100644 index 000000000000..2883f17cacec --- /dev/null +++ b/app-emulation/qemu-kvm-spice/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>no-herd</herd> + <maintainer> + <email>dev-zero@gentoo.org</email> + <name>Tiziano Müller</name> + </maintainer> + <use> + <flag name='aio'>Enables support for Linux's Async IO</flag> + <flag name='alsa'>Enable alsa output for sound emulation</flag> + <flag name='esd'>Enable esound output for sound emulation</flag> + <flag name='fdt'>Enables firmware device tree support</flag> + <flag name='gnutls'>Enable TLS support for the VNC console server</flag> + <flag name='kvm-trace'>Allows you to use KVM tracing</flag> + <flag name='ncurses'>Enable the ncurses-based console</flag> + <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag> + <flag name='qemu-ifup'>Provides the qemu-ifup script for use with QEMU's + built in bridging</flag> + <flag name='sdl'>Enable the SDL-based console</flag> + <flag name='vde'>Enable VDE-based networking</flag> + </use> +</pkgmetadata> diff --git a/app-emulation/qemu-kvm-spice/qemu-kvm-spice-14.9999.ebuild b/app-emulation/qemu-kvm-spice/qemu-kvm-spice-14.9999.ebuild new file mode 100644 index 000000000000..05c19e89753e --- /dev/null +++ b/app-emulation/qemu-kvm-spice/qemu-kvm-spice-14.9999.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm-spice/qemu-kvm-spice-14.9999.ebuild,v 1.1 2010/08/12 08:41:58 dev-zero Exp $ + +EAPI="2" + +inherit eutils flag-o-matic git linux-info toolchain-funcs + +DESCRIPTION="Spiced QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="http://www.linux-kvm.org http://spice-space.org/" +EGIT_REPO_URI="git://git.freedesktop.org/git/spice/qemu" +EGIT_BRANCH="spice.kvm.v${PV/.9999}" +EGIT_COMMIT="${EGIT_BRANCH}" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +# xen is disabled until the deps are fixed +IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \ +pulseaudio qemu-ifup sasl sdl static vde" + +# Updated targets to use the only supported upstream target - x86_64-softmmu +COMMON_TARGETS="" +IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64" +IUSE_USER_TARGETS="" +#COMMON_TARGETS="i386 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" +#IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64 mips64 mips64el ppcemb" +#IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus" + +for target in ${IUSE_SOFTMMU_TARGETS}; do + IUSE="${IUSE} +qemu_softmmu_targets_${target}" +done + +for target in ${IUSE_USER_TARGETS}; do + IUSE="${IUSE} +qemu_user_targets_${target}" +done + +RESTRICT="test" + +RDEPEND=" + !app-emulation/kqemu + !app-emulation/qemu + !app-emulation/qemu-softmmu + !app-emulation/qemu-user + !app-emulation/qemu-kvm + sys-apps/pciutils + >=sys-apps/util-linux-2.16.0 + sys-libs/zlib + aio? ( dev-libs/libaio ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bluetooth? ( net-wireless/bluez ) + curl? ( net-misc/curl ) + esd? ( media-sound/esound ) + fdt? ( sys-apps/dtc ) + gnutls? ( net-libs/gnutls ) + ncurses? ( sys-libs/ncurses ) + pulseaudio? ( media-sound/pulseaudio ) + qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) + sasl? ( dev-libs/cyrus-sasl ) + sdl? ( >=media-libs/libsdl-1.2.11[X] ) + vde? ( net-misc/vde ) + app-emulation/spice" + +DEPEND="${RDEPEND} + app-text/texi2html + >=sys-kernel/linux-headers-2.6.29 + gnutls? ( dev-util/pkgconfig )" + +kvm_kern_warn() { + eerror "Please enable KVM support in your kernel, found at:" + eerror + eerror " Virtualization" + eerror " Kernel-based Virtual Machine (KVM) support" + eerror +} + +pkg_setup() { + + local counter="0" check + use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" + for check in ${IUSE_SOFTMMU_TARGETS} ; do + use "qemu_softmmu_targets_${check}" && counter="1" + done + [[ ${counter} == 0 ]] && die "You need to set at least 1 target in QEMU_SOFTMMU_TARGETS" + + if kernel_is lt 2 6 25; then + eerror "This version of KVM requres a host kernel of 2.6.25 or higher." + eerror "Either upgrade your kernel" + else + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + kvm_kern_warn + elif ! linux_chkconfig_present KVM; then + kvm_kern_warn + fi + fi + + enewgroup kvm +} + +src_prepare() { + # prevent docs to get automatically installed + sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die + # Alter target makefiles to accept CFLAGS set via flag-o + sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target || die + # append CFLAGS while linking + sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die + + # remove part to make udev happy + sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die + + epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" \ + "${FILESDIR}/qemu-kvm-0.12.3-include-madvise-defines.patch" +} + +src_configure() { + local conf_opts audio_opts softmmu_targets user_targets + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + use "qemu_softmmu_targets_${target}" && \ + softmmu_targets="${softmmu_targets} ${target}-softmmu" + done + + for target in ${IUSE_USER_TARGETS} ; do + use "qemu_user_targets_${target}" && \ + user_targets="${user_targets} ${target}-linux-user" + done + + if [ ! -z "${softmmu_targets}" ]; then + einfo "Building the following softmmu targets: ${softmmu_targets}" + fi + + if [ ! -z "${user_targets}" ]; then + einfo "Building the following user targets: ${user_targets}" + conf_opts="${conf_opts} --enable-linux-user" + else + conf_opts="${conf_opts} --disable-linux-user" + fi + + # Fix QA issues. QEMU needs executable heaps and we need to mark it as such + conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap" + + # Add support for static builds + use static && conf_opts="${conf_opts} --static" + + #config options + conf_opts="${conf_opts} $(use_enable aio linux-aio)" + use bluetooth || conf_opts="${conf_opts} --disable-bluez" + conf_opts="${conf_opts} $(use_enable curl)" + use gnutls || conf_opts="${conf_opts} --disable-vnc-tls" + conf_opts="${conf_opts} $(use_enable fdt)" + use hardened && conf_opts="${conf_opts} --enable-user-pie" + use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace" + use ncurses || conf_opts="${conf_opts} --disable-curses" + use sasl || conf_opts="${conf_opts} --disable-vnc-sasl" + use sdl || conf_opts="${conf_opts} --disable-sdl" + use vde || conf_opts="${conf_opts} --disable-vde" +# conf_opts="${conf_opts} $(use_enable xen)" + conf_opts="${conf_opts} --disable-xen" + conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user" + + # audio options + audio_opts="oss" + use alsa && audio_opts="alsa ${audio_opts}" + use esd && audio_opts="esd ${audio_opts}" + use pulseaudio && audio_opts="pa ${audio_opts}" + use sdl && audio_opts="sdl ${audio_opts}" + ./configure --prefix=/usr \ + --disable-strip \ + --enable-kvm \ + --enable-nptl \ + --enable-uuid \ + ${conf_opts} \ + --audio-drv-list="${audio_opts}" \ + --target-list="${softmmu_targets} ${user_targets}" \ + --cc="$(tc-getCC)" \ + --host-cc="$(tc-getBUILD_CC)" \ + --enable-spice \ + || die "configure failed" + + # this is for qemu upstream's threaded support which is + # in development and broken + # the kvm project has its own support for threaded IO + # which is always on and works +# --enable-io-thread \ +} + +src_compile() { + # spice patchset introduces some parallel make issues + # will be fixed when patches arrive at qemu-kvm upstream + emake -j1 || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + insinto /etc/udev/rules.d/ + doins kvm/scripts/65-kvm.rules || die + + if use qemu-ifup; then + insinto /etc/qemu/ + insopts -m0755 + doins kvm/scripts/qemu-ifup || die + fi + + dodoc Changelog MAINTAINERS TODO pci-ids.txt || die + newdoc pc-bios/README README.pc-bios || die + dohtml qemu-doc.html qemu-tech.html || die + + if use qemu_softmmu_targets_x86_64 ; then + dobin "${FILESDIR}"/qemu-kvm + dosym /usr/bin/qemu-kvm /usr/bin/kvm + else + elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" + elog "of /usr/bin/qemu-kvm and /usr/bin/kvm" + fi +} + +pkg_postinst() { + elog "If you don't have kvm compiled into the kernel, make sure you have" + elog "the kernel module loaded before running kvm. The easiest way to" + elog "ensure that the kernel module is loaded is to load it on boot." + elog "For AMD CPUs the module is called 'kvm-amd'" + elog "For Intel CPUs the module is called 'kvm-intel'" + elog "Please review /etc/conf.d/modules for how to load these" + elog + elog "Make sure your user is in the 'kvm' group" + elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login." + elog + elog "You will need the Universal TUN/TAP driver compiled into your" + elog "kernel or loaded as a module to use the virtual network device" + elog "if using -net tap. You will also need support for 802.1d" + elog "Ethernet Bridging and a configured bridge if using the provided" + elog "kvm-ifup script from /etc/kvm." + echo + ewarn "In case you haven't noted: this is a live ebuild of qemu-kvm with" + ewarn "spice patches on top of it." + ewarn "Version tag is changed when the spice devs rebase their patches to a new tip" + ewarn "of the qemu-kvm git repository." + ewarn "This package is going away as soon as the spice patches get merged at qemu-kvm upstream." +} |