From daa8f1c1721245f926d8ded7f28bc649edf8b9f7 Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Fri, 19 Mar 2010 17:09:07 +0000 Subject: [PATCH] Die, when nothing from QEMU_SOFTMMU_TARGETS is defined, fixes bug 310243 Package-Manager: portage-2.2_rc67-r2/cvs/Linux x86_64 --- app-emulation/qemu-kvm/ChangeLog | 6 +++++- app-emulation/qemu-kvm/Manifest | 18 +++++++++--------- .../qemu-kvm/qemu-kvm-0.12.2-r2.ebuild | 7 ++----- app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild | 7 ++----- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index 790a5c4a2b2b..631494153980 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.23 2010/03/10 18:20:19 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.24 2010/03/19 17:09:07 tommy Exp $ + + 19 Mar 2010; Thomas Sachau (Tommy[D]) + qemu-kvm-0.12.2-r2.ebuild, qemu-kvm-0.12.3.ebuild: + Die, when nothing from QEMU_SOFTMMU_TARGETS is defined, fixes bug 310243 10 Mar 2010; Thomas Sachau (Tommy[D]) qemu-kvm-0.12.2-r2.ebuild: diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index 5fc0b6599e49..4592ce8f8f1f 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -11,17 +11,17 @@ DIST qemu-kvm-0.12.2.tar.gz 4713699 RMD160 1581fa5ec5dc168de3667a3c28cd56ba0b2e2 DIST qemu-kvm-0.12.3.tar.gz 4718791 RMD160 fe88117e6e32188e097a86f95bffc4b74422a5e6 SHA1 235a790056a1b751791e64dd499129b2dbf55be8 SHA256 77cccdc8938b33f3ed74763d01deaad58918c85f04a06afd10f00857b504c2b2 EBUILD qemu-kvm-0.11.1-r1.ebuild 5797 RMD160 a3f4f239cd7a6cc9a7debfe6d347e0d9e1f288ff SHA1 60f6d85c50b14c3926e5e7e5f44e576bbf916d6a SHA256 a3d6efc3bcf9f169bbcad3ebe1dd0efbfb71ad1b185ab26c003191594b34edd4 EBUILD qemu-kvm-0.11.1.ebuild 5725 RMD160 87f907a96b5b7cc6387de9b738c6261c57605877 SHA1 5cb4172354f07be1c0b9199b1aa2d880d5b1ef54 SHA256 7bd18bfac7eaa453b5edacc4111426ceab8a8652b311ad97cb6310a42392f5ed -EBUILD qemu-kvm-0.12.2-r2.ebuild 7110 RMD160 6baa244278b54558e019f056b9757c720c5f1975 SHA1 9cf52c4ccad728e4eb7e08702a3c2bed119cf1e3 SHA256 5738e120cf64033018855c9af7c4d69bd8c26860fcc7bf9424ac11e0b2e8bfad -EBUILD qemu-kvm-0.12.3.ebuild 7108 RMD160 e92da5efdd82756dd0c569774eeb1c82b434af97 SHA1 624085171f0d67517129a6cb225a76f7a8447add SHA256 33dcde730b4fc725a2241072c68b15b74a4044f28021c76c006bc165222b8617 +EBUILD qemu-kvm-0.12.2-r2.ebuild 7018 RMD160 b28c3f9286de1d5f93d523499cd941cbb526e777 SHA1 ba385de7c8d1f7166a1ae086eed4f7b02ab11269 SHA256 67c4721f6fe4b6ca0c80276d3c056c8c3e29382b12672df19fd95973e98451f4 +EBUILD qemu-kvm-0.12.3.ebuild 7016 RMD160 6fa33134702a53b50ef0cb5a7b15508b91d61c11 SHA1 103ce26039f8d66db3d98b33ad43c3efb42bc42b SHA256 0c8ed134a573b6c50370108e9654ef96faf8123c7c2ea6c408e0088d1a07e44b EBUILD qemu-kvm-9999.ebuild 6966 RMD160 ccddfa0584684e8a08a52656aa704afc59ba3da4 SHA1 abf1581414776ab93b44a69989f2502160b0cfbd SHA256 cc6d1bffac166fefe6832f7d465d6e9945df86d5de000a52105a24d44e7c43bb -MISC ChangeLog 4907 RMD160 4f62bb7556df0a1d91ad3030a423b379f123cb4b SHA1 adbf1171b34523d2043f65377c5407d34a66b0a2 SHA256 cd582420af51ad497efe252257f35b9c8c450492c1dd5b9f1853687ef2400ad3 +MISC ChangeLog 5095 RMD160 28f4536c166955a33f404f332eeb05c6f54ada1a SHA1 439685e1cbecd04c66e661079604a09dbfc93163 SHA256 324422611c91fd8c603cffc5ba8afb5487d429b8dee3c226abaed4ae7e7ec854 MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iJwEAQECAAYFAkuX4u0ACgkQG7kqcTWJkGcVgAP+Lr3eJPzGfYk6soNIixF6UduF -Iik1+3szj/elMrVvKokMh5WXLemQggKKFIIrPz43REgFOg9U+NRlmkG7cqb9jUk+ -uy8kYWCjJotnWMChiUC7wi+CvTZ0ViVplvBLBCSaujhfGYbEDq1rC9K319mGITdx -zbeFqsYrTI39rHe5Blo= -=jeOj +iJwEAQECAAYFAkujr8EACgkQG7kqcTWJkGfURwQAqETZQWafXPO1MnX/Ea97OZQJ +vrz4HeCyqi2Y7KJKyxFrvMHis684vj/aLrHaK2HhThkY7NhPBS/5X8prOrV6EVi6 +IqnYjgD+8MSWM5zPaPSj1OjBSFLTm1e5eAOO5B4lTwmxbwTeJGex0hCVrpilfadX +YQDJdpyQNP8XpgKnZZ8= +=kBAX -----END PGP SIGNATURE----- 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 56bc65c2d83a..0739c6318d69 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.2 2010/03/10 18:20:19 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild,v 1.3 2010/03/19 17:09:07 tommy Exp $ EAPI="2" @@ -85,10 +85,7 @@ pkg_setup() { 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" + [[ ${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." diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild index d38efdb8847f..b647b0a8b780 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.3.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.3.ebuild,v 1.2 2010/03/10 18:17:27 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild,v 1.3 2010/03/19 17:09:07 tommy Exp $ EAPI="2" @@ -84,10 +84,7 @@ pkg_setup() { 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" + [[ ${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." -- 2.26.2