summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2010-03-10 18:20:19 +0000
committerThomas Sachau <tommy@gentoo.org>2010-03-10 18:20:19 +0000
commita5a1ec227ccbffab652c83bf3354cdaed86d91c6 (patch)
tree9db2751c5c71742a53b3e6de3baf599b95049706 /app-emulation/qemu-kvm
parentAdd message, if no targets are defined (bug #298287), some cleanup, remove ol... (diff)
downloadgentoo-2-a5a1ec227ccbffab652c83bf3354cdaed86d91c6.tar.gz
gentoo-2-a5a1ec227ccbffab652c83bf3354cdaed86d91c6.tar.bz2
gentoo-2-a5a1ec227ccbffab652c83bf3354cdaed86d91c6.zip
Also apply changes to 0.12.2-r2
(Portage version: 2.2_rc67-r1/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/qemu-kvm')
-rw-r--r--app-emulation/qemu-kvm/ChangeLog6
-rw-r--r--app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild15
2 files changed, 17 insertions, 4 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 3ecd8345bb5e..790a5c4a2b2b 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,10 @@
# 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.22 2010/03/10 18:17:27 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.23 2010/03/10 18:20:19 tommy Exp $
+
+ 10 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ qemu-kvm-0.12.2-r2.ebuild:
+ Also apply changes to 0.12.2-r2
10 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
-qemu-kvm-0.12.1.ebuild, -qemu-kvm-0.12.1.1.ebuild,
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild
index fcdc6623511b..56bc65c2d83a 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.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.2-r2.ebuild,v 1.1 2010/02/15 16:40:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild,v 1.2 2010/03/10 18:20:19 tommy Exp $
EAPI="2"
@@ -71,7 +71,7 @@ DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-2.6.29
gnutls? ( dev-util/pkgconfig )"
-kvm_kern_war() {
+kvm_kern_warn() {
eerror "Please enable KVM support in your kernel, found at:"
eerror
eerror " Virtualization"
@@ -80,10 +80,19 @@ kvm_kern_war() {
}
pkg_setup() {
+
+ local counter="0" check
+ for check in ${IUSE_SOFTMMU_TARGETS} ; do
+ use "qemu_softmmu_targets_${check}" && counter="1"
+ done
+ for check in ${IUSE_USER_TARGETS} ; do
+ use "qemu_user_targets_${check}" && counter="1"
+ done
+ [[ ${counter} == 0 ]] && eerror "You did not set any targets, this is NOT SUPPORTED"
+
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"
else
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"