From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09979139083 for ; Thu, 21 Dec 2017 03:01:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BDC0E1019; Thu, 21 Dec 2017 03:01:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA78CE1019 for ; Thu, 21 Dec 2017 03:01:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27E8D33C1EB for ; Thu, 21 Dec 2017 03:01:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7467AA6AE for ; Thu, 21 Dec 2017 03:00:59 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1513825224.98bce0c3bdf492bc9fcb83cdee7e627f81bea663.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-2.10.1-r1.ebuild app-emulation/qemu/qemu-2.10.1.ebuild app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 98bce0c3bdf492bc9fcb83cdee7e627f81bea663 X-VCS-Branch: master Date: Thu, 21 Dec 2017 03:00:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 72c0cda6-9f87-4597-81c9-9d3b2e0c2c61 X-Archives-Hash: f893c0cbd5b82d5965df7dfb0a3ec221 commit: 98bce0c3bdf492bc9fcb83cdee7e627f81bea663 Author: George Gaydarov gg7 io> AuthorDate: Fri Nov 24 21:23:20 2017 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Dec 21 03:00:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98bce0c3 app-emulation/qemu: Make CONFIG_CHECK CPU-model dependent Closes: https://github.com/gentoo/gentoo/pull/6285 Signed-off-by: George Gaydarov gg7.io> Signed-off-by: Matthias Maier gentoo.org> app-emulation/qemu/{qemu-2.10.1.ebuild => qemu-2.10.1-r1.ebuild} | 6 +++++- app-emulation/qemu/qemu-9999.ebuild | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app-emulation/qemu/qemu-2.10.1.ebuild b/app-emulation/qemu/qemu-2.10.1-r1.ebuild similarity index 99% rename from app-emulation/qemu/qemu-2.10.1.ebuild rename to app-emulation/qemu/qemu-2.10.1-r1.ebuild index 944fecea967..dcf84b71ab6 100644 --- a/app-emulation/qemu/qemu-2.10.1.ebuild +++ b/app-emulation/qemu/qemu-2.10.1-r1.ebuild @@ -286,7 +286,11 @@ pkg_pretend() { ERROR_VHOST_NET+=" support" if use amd64 || use x86 || use amd64-linux || use x86-linux; then - CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL" + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi fi use python && CONFIG_CHECK+=" ~DEBUG_FS" diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 1f09b78248a..97e3556cc40 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -283,7 +283,11 @@ pkg_pretend() { ERROR_VHOST_NET+=" support" if use amd64 || use x86 || use amd64-linux || use x86-linux; then - CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL" + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi fi use python && CONFIG_CHECK+=" ~DEBUG_FS"