diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2012-03-08 23:05:08 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2012-03-08 23:05:08 +0000 |
| commit | 68c50bc818343864362cd7ffe51097372904c05c (patch) | |
| tree | 0e9f35c0c758492dd85ced7a4071c1e7a961538f /app-emulation/qemu-kvm | |
| parent | Marking gromacs-4.5.5-r1 ppc64 for bug 391147 (diff) | |
| download | historical-68c50bc818343864362cd7ffe51097372904c05c.tar.gz historical-68c50bc818343864362cd7ffe51097372904c05c.tar.bz2 historical-68c50bc818343864362cd7ffe51097372904c05c.zip | |
Only warn about the lack of kvm-amd or kvm-intel on amd64 and x86.
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/qemu-kvm')
| -rw-r--r-- | app-emulation/qemu-kvm/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-1.0-r3.ebuild | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index 02a77b53e289..f8335cb67bc2 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emulation/qemu-kvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.109 2012/03/08 18:26:38 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.110 2012/03/08 23:05:08 cardoe Exp $ + + 08 Mar 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.0-r3.ebuild: + Only warn about the lack of kvm-amd or kvm-intel on amd64 and x86. 08 Mar 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.0-r3.ebuild: Prefix with spaces rather than suffix for wrapped lines cause #gentoo-dev diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index 8ae4c9ae804b..5b92bcf58b50 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -13,7 +13,7 @@ AUX qemu-kvm-guest-hang-on-usb-add.patch 3491 RMD160 7bc186c283b0eb220a47895f7ca DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d33323b SHA1 2716ddfc49d98fee67a1ff0de9b199d211e72bec SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e DIST qemu-kvm-1.0.tar.gz 6210473 RMD160 6503b6ec9c8d89b785d644f5c4b47b4716e2fab7 SHA1 c16be4924c30747d93d609b7909e9e9239150c9a SHA256 b711ead5a0a28bf43e7e51ce2082e37120a3527ab012c609bc30fb94d37e116e EBUILD qemu-kvm-0.15.1-r1.ebuild 9648 RMD160 c32ecba429c843027756a6978c71a38b5d617fac SHA1 8f0c697a859f3336b95a6a8ab7dcb35d49913d6e SHA256 ada1fd9e880e635917aee17c5c0aba97f4af05ed7362bd0eda8ced4b72d34ac9 -EBUILD qemu-kvm-1.0-r3.ebuild 11636 RMD160 cd50060003bbe2fe3998f4e34fbd6ccd20914fd8 SHA1 e1280d7a66abf49d16f81744d1b70d3459ea1105 SHA256 9361019ba8ea7e1d9a07dc8faed343ad80d34dd456cdbab5d8bb6bcae27516bb +EBUILD qemu-kvm-1.0-r3.ebuild 11733 RMD160 9ba8c240f5ea377770e5bc5264243051f970072f SHA1 6d0372fda37dbee509b91b54133a1b748ec72281 SHA256 15a678deb69ac012a56e9567f6de004520fdb095e48f843f3115151c5aef83eb EBUILD qemu-kvm-9999.ebuild 10636 RMD160 efe665b1bd5bcfec95ef388079eabdb3c91378f4 SHA1 23373c91997d1caf69e2034e3ceaa9c98676da20 SHA256 c4b4f284c510d538e0e2fca11ff5620eaca71534203839b8c37ba939dfe69510 -MISC ChangeLog 22440 RMD160 b12f7d3044105fbedac741a856143cd1bfda9cad SHA1 bc1feb3f8b647d1ef5265bcb7554ccdd3860021b SHA256 8fb9e9dcc9a3adb9525c35abbdb9644eb0339c640069c559ea4e63fc0834c047 +MISC ChangeLog 22584 RMD160 62c5463dddbb58e4af5122e4b13a148fc66d5f20 SHA1 60b79bde472b5582692fbf1718b59ae525827104 SHA256 6223e0da9c69385a952d403b45c4c3f950ee0d24bff0a8f1264449105f34086d MISC metadata.xml 2070 RMD160 db36ad2117e1800a00496e17f8659d95e467a6b0 SHA1 8310beee43d08ca886bd5f1878351b74290ccdcd SHA256 f10d80ca32375366525b8c65583152db3ab8793415067132b98b86d6ee04e5d6 diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.0-r3.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.0-r3.ebuild index 8f97bce20079..c7dc68ea7a1b 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-1.0-r3.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-1.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0-r3.ebuild,v 1.10 2012/03/08 18:26:38 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0-r3.ebuild,v 1.11 2012/03/08 23:05:08 cardoe Exp $ #BACKPORTS=1 @@ -144,7 +144,7 @@ pkg_pretend() { if ! linux_config_exists; then eerror "Unable to check your kernel for KVM support" else - CONFIG_CHECK="~KVM ~KVM_AMD ~KVM_INTEL ~TUN ~BRIDGE" + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" ERROR_KVM="You must enable KVM in your kernel to continue" ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" ERROR_KVM_AMD+=" your kernel configuration." @@ -159,6 +159,10 @@ pkg_pretend() { ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" ERROR_VHOST_NET+=" support" + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL" + fi + # Now do the actual checks setup above check_extra_config fi |