diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-21 20:47:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-21 20:47:17 +0000 |
commit | 4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 (patch) | |
tree | f7640b8b96a04499f1ce44a2cad122d45a8373bd /app-emulation/qemu | |
parent | 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (diff) |
gentoo resync : 21.12.2017
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r-- | app-emulation/qemu/Manifest | 4 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-2.10.1-r1.ebuild (renamed from app-emulation/qemu/qemu-2.10.1.ebuild) | 6 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index fbbeee61b69e..1c93ddc7b00f 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -8,6 +8,6 @@ AUX qemu-2.5.0-sysmacros.patch 333 BLAKE2B 8c38410c6ea789f669d89c7321cdc9e5c734b AUX qemu-binfmt.initd.head 1445 BLAKE2B 5762a38034331a13e308f6fc8cb979e38ae01a053691726edfc1d99e1bca1698919ad564a593e018308f1fd00e2f887865fd9db157d8de83941295bc47c1db6c SHA512 a735268ae9ac84d8f2f2893bf018ee6de33231fa94a823bd8502b529bb456635c1ab5cf9b440df5ede8e414291f8bf45fc53898c2f3939c50d5ec4ffa554396a AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-2.10.1.tar.bz2 30821108 BLAKE2B bb096139f6b387a3cf3933dd3aeb97777479022b1b34ed0212b51d7061f9a19b3e83a4e9a13c6cf81c14718731ddf8646226a5b0d99ebbc9abb387d7eec94238 SHA512 1a4a6ebf700ec6851c83cc2a71eaea8d95f14c685d094eaaa86c740eb9401e49a79074b72385f58681ca7646771a99bb6bbd9bebb39162f7220626d37ed0654f -EBUILD qemu-2.10.1.ebuild 23397 BLAKE2B e01c1bc4ec551d626d8db33c1adb9f86a21e532807657a376e808c70aa6f5595954761c125a9b481089bef3c89e7af621aa7153b6bb3a8b440baa3ad4a834629 SHA512 75aece0e984bb7db7b73fa813d7e113fcec235411b1d0379c4e98d4bd697262b2f28f9422ee4211e88d96778c08aef5d816d3a42abea099e1cb578c343b6bd5b -EBUILD qemu-9999.ebuild 23235 BLAKE2B e0546ab575ebdbfef7c0a40462f7040e2b094054d2fce92abebb4f1ab68cb4a5dd7a610138710403b614954e6e8d1604f23be4030bc9b81e9ee00cd1facd0903 SHA512 805cc8c3a375c7bbdf18d49df9b516af9a1f25e6b00b99e4ae017e45a6faf78462e532cbe4373a2f67178a6d23747a85bc21e53fbd0b9868c879ba0557117e01 +EBUILD qemu-2.10.1-r1.ebuild 23525 BLAKE2B 656ee4c6819ff584e754f0f56fbdf6337c1ccae796817d5c624a3c32be2130d9aa3815a028f9cf10ac50bd4adc4c7157a4f8f1dcdeafb78f67b873ffc4a5ae72 SHA512 c9abfee1bf8efcade96dab738d6d4e3868ba49ec0513cb17f9de2f6fc7953e9013704a5b83659bf51039af20aec576f3ef67c2034aae00816cd7fae97a24c3c5 +EBUILD qemu-9999.ebuild 23363 BLAKE2B d4f89913aab43a08d582a6c3251ac61222a4b085c4c7b425e5f68bdae9994b624dc7234e2bcb55cbc54ee3bc97fe0b2e2185a20c75892b8ccf0aaa4e472ecf45 SHA512 82717b7f42c5ce42d80047faaad344bbf848a074d78e6145148f107daa8a110c3b67f401ccfffa8b3744ae74f0858ca98e3409685306b60b629021c97f76e9b4 MISC metadata.xml 3794 BLAKE2B 626ed8aa0c868513122b44083f2c76fc758f09624600770b1b267328b08335cc60b4167b37a4f418985c810dfea23bb7792c9b874166842e8fd34ba2c24a146a SHA512 10f130f225b90dacf8262247d795a247abfdcbf3ad5fbe0693e8d4db79f755984f690cb150a7eb5a8e5d669ce404145c4fbb6b200d6362319be74759fd78b6d3 diff --git a/app-emulation/qemu/qemu-2.10.1.ebuild b/app-emulation/qemu/qemu-2.10.1-r1.ebuild index 944fecea9676..dcf84b71ab60 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 1f09b78248a4..97e3556cc400 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" |