diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2010-08-05 15:56:35 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2010-08-05 15:56:35 +0000 |
commit | da1fc350817bf972823b80361f4979ef0cc31296 (patch) | |
tree | 544d48b09cc561065716a6728a19aaa76780d106 /app-emulation | |
parent | Remove old version that wasn't properly applying patches and fix patch applic... (diff) | |
download | gentoo-2-da1fc350817bf972823b80361f4979ef0cc31296.tar.gz gentoo-2-da1fc350817bf972823b80361f4979ef0cc31296.tar.bz2 gentoo-2-da1fc350817bf972823b80361f4979ef0cc31296.zip |
Remove older versions. Remove versions with broken epatch line. Fix epatch line for future versions
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/qemu-kvm/ChangeLog | 9 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-0.11.1.ebuild | 185 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild | 233 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-0.12.4-r2.ebuild | 241 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-0.12.4-r3.ebuild | 241 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-0.12.4.ebuild | 235 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild | 5 |
7 files changed, 11 insertions, 1138 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index cce81b9935fb..0d9e48ab624c 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/qemu-kvm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.34 2010/07/27 23:40:49 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.35 2010/08/05 15:56:35 cardoe Exp $ + + 05 Aug 2010; Doug Goldstein <cardoe@gentoo.org> -qemu-kvm-0.11.1.ebuild, + -qemu-kvm-0.12.3.ebuild, -qemu-kvm-0.12.4.ebuild, + -qemu-kvm-0.12.4-r2.ebuild, -qemu-kvm-0.12.4-r3.ebuild, + qemu-kvm-0.12.5.ebuild: + Remove older versions. Remove versions with broken epatch line. Fix epatch + line for future versions *qemu-kvm-0.12.5 (27 Jul 2010) diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.11.1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.11.1.ebuild deleted file mode 100644 index 6a34eafd33b4..000000000000 --- a/app-emulation/qemu-kvm/qemu-kvm-0.11.1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# 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/qemu-kvm-0.11.1.ebuild,v 1.4 2010/06/30 21:46:32 truedfx Exp $ - -EAPI="2" - -inherit eutils flag-o-matic toolchain-funcs linux-info - -SRC_URI="mirror://sourceforge/kvm/${P}.tar.gz" - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.linux-kvm.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde" - -COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc \ -ppc64 sh4 sh4eb sparc" - -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb" -IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 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="sys-libs/zlib - net-misc/bridge-utils - sys-apps/iproute2 - sys-apps/pciutils - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - esd? ( media-sound/esound ) - gnutls? ( net-libs/gnutls ) - ncurses? ( sys-libs/ncurses ) - pulseaudio? ( media-sound/pulseaudio ) - sasl? ( dev-libs/cyrus-sasl ) - sdl? ( >=media-libs/libsdl-1.2.11[X] ) - vde? ( net-misc/vde ) - !app-emulation/qemu-softmmu - !app-emulation/qemu-user - !app-emulation/qemu - !app-emulation/kqemu" - -DEPEND="${RDEPEND} - app-text/texi2html - >=sys-kernel/linux-headers-2.6.29 - gnutls? ( dev-util/pkgconfig )" - -pkg_setup() { - 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" - die "qemu-kvm version not compatible" - elif ! linux_chkconfig_present KVM; then - eerror "Please enable KVM support in your kernel, found at:" - eerror - eerror " Virtualization" - eerror " Kernel-based Virtual Machine (KVM) support" - eerror - eerror "or enable the 'modules' USE flag." - die "KVM support not detected!" - fi - - enewgroup kvm -} - -src_prepare() { - # avoid fdt till an updated release appears - sed -i -e 's:fdt="yes":fdt="no":' configure - # prevent docs to get automatically installed - sed -i '/$(DESTDIR)$(docdir)/d' Makefile - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target - [[ -x /sbin/paxctl ]] && \ - sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ - Makefile.target - # append CFLAGS while linking - sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak - - # remove part to make udev happy - sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules - - epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" -} - -src_configure() { - local conf_opts audio_opts softmmu_targets user_targets - - #works fine for me without, drop with next version, if there are - #no complains - #Thomas Sachau <tommy@gentoo.org - #filter-flags -fpie -fstack-protector - - 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 - - #config options - use gnutls || conf_opts="$conf_opts --disable-vnc-tls" - use ncurses || conf_opts="$conf_opts --disable-curses" - use sdl || conf_opts="$conf_opts --disable-sdl" - use vde || conf_opts="$conf_opts --disable-vde" - use bluetooth || conf_opts="$conf_opts --disable-bluez" - use sasl || conf_opts="$conf_opts --disable-vnc-sasl" - 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 \ - --disable-xen \ - ${conf_opts} \ - --audio-drv-list="$audio_opts" \ - --target-list="${softmmu_targets} ${user_targets}" \ - --cc="$(tc-getCC)" \ - --host-cc="$(tc-getCC)" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - insinto /etc/udev/rules.d/ - doins kvm/scripts/65-kvm.rules - - insinto /etc/qemu/ - insopts -m0755 - doins kvm/scripts/qemu-ifup - doins kvm/scripts/qemu-ifdown - - dodoc Changelog MAINTAINERS TODO pci-ids.txt || die - newdoc pc-bios/README README.pc-bios || die - dohtml qemu-doc.html qemu-tech.html -} - -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 -} diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild deleted file mode 100644 index d490857eaeb2..000000000000 --- a/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# 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/qemu-kvm-0.12.3.ebuild,v 1.5 2010/06/30 21:46:32 truedfx Exp $ - -EAPI="2" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" - GIT_ECLASS="git" -fi - -inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs - -if [[ ${PV} = *9999* ]]; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.linux-kvm.org" - -LICENSE="GPL-2" -SLOT="0" -# 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" - -COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} 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 - 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 ) -" - -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" -} - -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)" \ - || 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_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 -} diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r2.ebuild deleted file mode 100644 index 382d12af34b6..000000000000 --- a/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r2.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# 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/qemu-kvm-0.12.4-r2.ebuild,v 1.1 2010/07/20 22:58:39 cardoe Exp $ - -BACKPORTS=1 - -EAPI="2" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" - GIT_ECLASS="git" -fi - -inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs - -if [[ ${PV} = *9999* ]]; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz - ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.linux-kvm.org" - -LICENSE="GPL-2" -SLOT="0" -# 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" - -COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} 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 - 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 ) -" - -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}"/${PN}-0.12.3-fix-crash-with-sdl.patch \ - "${FILESDIR}"/${PN}-0.12.3-include-madvise-defines.patch - - [[ -n ${BACKPORTS} ]] && \ - EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" epatch -} - -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)" \ - || 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_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 -} diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r3.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r3.ebuild deleted file mode 100644 index f2c27285c96b..000000000000 --- a/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r3.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# 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/qemu-kvm-0.12.4-r3.ebuild,v 1.1 2010/07/20 23:39:35 cardoe Exp $ - -BACKPORTS=2 - -EAPI="2" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" - GIT_ECLASS="git" -fi - -inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs - -if [[ ${PV} = *9999* ]]; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz - ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.linux-kvm.org" - -LICENSE="GPL-2" -SLOT="0" -# 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" - -COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} 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 - 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 ) -" - -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}"/${PN}-0.12.3-fix-crash-with-sdl.patch \ - "${FILESDIR}"/${PN}-0.12.3-include-madvise-defines.patch - - [[ -n ${BACKPORTS} ]] && \ - EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" epatch -} - -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)" \ - || 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_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 -} diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.4.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.4.ebuild deleted file mode 100644 index e96cd3f51e68..000000000000 --- a/app-emulation/qemu-kvm/qemu-kvm-0.12.4.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# 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/qemu-kvm-0.12.4.ebuild,v 1.2 2010/06/30 21:46:32 truedfx Exp $ - -EAPI="2" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" - GIT_ECLASS="git" -fi - -inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs - -if [[ ${PV} = *9999* ]]; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.linux-kvm.org" - -LICENSE="GPL-2" -SLOT="0" -# 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" - -COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} 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 - 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 ) -" - -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}"/${PN}-0.12.3-fix-crash-with-sdl.patch \ - "${FILESDIR}"/${PN}-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)" \ - || 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_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 -} diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild index 0598643b0662..80588f7a6394 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild @@ -1,6 +1,6 @@ # 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/qemu-kvm-0.12.5.ebuild,v 1.1 2010/07/27 23:40:49 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild,v 1.2 2010/08/05 15:56:34 cardoe Exp $ #BACKPORTS=2 @@ -122,7 +122,8 @@ src_prepare() { "${FILESDIR}"/${PN}-0.12.3-include-madvise-defines.patch [[ -n ${BACKPORTS} ]] && \ - EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" epatch + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ + epatch } src_configure() { |