vapier 14/05/31 16:02:42 Modified: ChangeLog qemu-2.0.0.ebuild qemu-9999.ebuild Log: Drop qemu-kvm wrapper entirely and tell people to use -enable-kvm instead. #506566 by nobody.
Revision Changes Path 1.261 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.261&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.261&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.260&r2=1.261 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- ChangeLog 25 May 2014 17:34:03 -0000 1.260 +++ ChangeLog 31 May 2014 16:02:42 -0000 1.261 @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.260 2014/05/25 17:34:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.261 2014/05/31 16:02:42 vapier Exp $ + + 31 May 2014; Mike Frysinger <[email protected]> qemu-2.0.0.ebuild, + qemu-9999.ebuild: + Drop qemu-kvm wrapper entirely and tell people to use -enable-kvm instead. + #506566 by nobody. 18 May 2014; Mike Frysinger <[email protected]> qemu-2.0.0.ebuild, qemu-9999.ebuild: 1.7 app-emulation/qemu/qemu-2.0.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?r1=1.6&r2=1.7 Index: qemu-2.0.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qemu-2.0.0.ebuild 18 May 2014 18:01:59 -0000 1.6 +++ qemu-2.0.0.ebuild 31 May 2014 16:02:42 -0000 1.7 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.6 2014/05/18 18:01:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.7 2014/05/31 16:02:42 vapier Exp $ EAPI=5 @@ -449,16 +449,6 @@ udev_dorules "${FILESDIR}"/65-kvm.rules fi - if use qemu_softmmu_targets_x86_64 ; then - newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm - ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed" - ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" - ewarn "your libvirt configs or other wrappers for ${PN}" - elif use x86 || use amd64; then - elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" - elog "of the /usr/bin/qemu-kvm script." - fi - if use python; then python_foreach_impl qemu_python_install fi @@ -529,6 +519,13 @@ ewarn "any saved states with a newer qemu." ewarn ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x" + + if use x86 || use amd64; then + ewarn + ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer" + ewarn "installed. In order to use kvm acceleration, pass the flag" + ewarn "-enable-kvm when running your system target." + fi fi virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid," 1.72 app-emulation/qemu/qemu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.72&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.72&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.71&r2=1.72 Index: qemu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- qemu-9999.ebuild 25 May 2014 17:34:03 -0000 1.71 +++ qemu-9999.ebuild 31 May 2014 16:02:42 -0000 1.72 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.71 2014/05/25 17:34:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.72 2014/05/31 16:02:42 vapier Exp $ EAPI=5 @@ -448,16 +448,6 @@ udev_dorules "${FILESDIR}"/65-kvm.rules fi - if use qemu_softmmu_targets_x86_64 ; then - newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm - ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed" - ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" - ewarn "your libvirt configs or other wrappers for ${PN}" - elif use x86 || use amd64; then - elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" - elog "of the /usr/bin/qemu-kvm script." - fi - if use python; then python_foreach_impl qemu_python_install fi @@ -528,6 +518,13 @@ ewarn "any saved states with a newer qemu." ewarn ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x" + + if use x86 || use amd64; then + ewarn + ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer" + ewarn "installed. In order to use kvm acceleration, pass the flag" + ewarn "-enable-kvm when running your system target." + fi fi virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
