| 1 |
vapier 14/05/31 16:02:42 |
| 2 |
|
| 3 |
Modified: ChangeLog qemu-2.0.0.ebuild qemu-9999.ebuild |
| 4 |
Log: |
| 5 |
Drop qemu-kvm wrapper entirely and tell people to use -enable-kvm instead. #506566 by nobody. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.261 app-emulation/qemu/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.261&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.261&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.260&r2=1.261 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v |
| 17 |
retrieving revision 1.260 |
| 18 |
retrieving revision 1.261 |
| 19 |
diff -u -r1.260 -r1.261 |
| 20 |
--- ChangeLog 25 May 2014 17:34:03 -0000 1.260 |
| 21 |
+++ ChangeLog 31 May 2014 16:02:42 -0000 1.261 |
| 22 |
@@ -1,6 +1,11 @@ |
| 23 |
# ChangeLog for app-emulation/qemu |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.260 2014/05/25 17:34:03 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.261 2014/05/31 16:02:42 vapier Exp $ |
| 27 |
+ |
| 28 |
+ 31 May 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0.ebuild, |
| 29 |
+ qemu-9999.ebuild: |
| 30 |
+ Drop qemu-kvm wrapper entirely and tell people to use -enable-kvm instead. |
| 31 |
+ #506566 by nobody. |
| 32 |
|
| 33 |
18 May 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0.ebuild, |
| 34 |
qemu-9999.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.7 app-emulation/qemu/qemu-2.0.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.7&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.7&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?r1=1.6&r2=1.7 |
| 43 |
|
| 44 |
Index: qemu-2.0.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v |
| 47 |
retrieving revision 1.6 |
| 48 |
retrieving revision 1.7 |
| 49 |
diff -u -r1.6 -r1.7 |
| 50 |
--- qemu-2.0.0.ebuild 18 May 2014 18:01:59 -0000 1.6 |
| 51 |
+++ qemu-2.0.0.ebuild 31 May 2014 16:02:42 -0000 1.7 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2014 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.6 2014/05/18 18:01:59 vapier Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.7 2014/05/31 16:02:42 vapier Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
@@ -449,16 +449,6 @@ |
| 61 |
udev_dorules "${FILESDIR}"/65-kvm.rules |
| 62 |
fi |
| 63 |
|
| 64 |
- if use qemu_softmmu_targets_x86_64 ; then |
| 65 |
- newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm |
| 66 |
- ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed" |
| 67 |
- ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" |
| 68 |
- ewarn "your libvirt configs or other wrappers for ${PN}" |
| 69 |
- elif use x86 || use amd64; then |
| 70 |
- elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" |
| 71 |
- elog "of the /usr/bin/qemu-kvm script." |
| 72 |
- fi |
| 73 |
- |
| 74 |
if use python; then |
| 75 |
python_foreach_impl qemu_python_install |
| 76 |
fi |
| 77 |
@@ -529,6 +519,13 @@ |
| 78 |
ewarn "any saved states with a newer qemu." |
| 79 |
ewarn |
| 80 |
ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x" |
| 81 |
+ |
| 82 |
+ if use x86 || use amd64; then |
| 83 |
+ ewarn |
| 84 |
+ ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer" |
| 85 |
+ ewarn "installed. In order to use kvm acceleration, pass the flag" |
| 86 |
+ ewarn "-enable-kvm when running your system target." |
| 87 |
+ fi |
| 88 |
fi |
| 89 |
|
| 90 |
virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid," |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.72 app-emulation/qemu/qemu-9999.ebuild |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.72&view=markup |
| 97 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.72&content-type=text/plain |
| 98 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.71&r2=1.72 |
| 99 |
|
| 100 |
Index: qemu-9999.ebuild |
| 101 |
=================================================================== |
| 102 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v |
| 103 |
retrieving revision 1.71 |
| 104 |
retrieving revision 1.72 |
| 105 |
diff -u -r1.71 -r1.72 |
| 106 |
--- qemu-9999.ebuild 25 May 2014 17:34:03 -0000 1.71 |
| 107 |
+++ qemu-9999.ebuild 31 May 2014 16:02:42 -0000 1.72 |
| 108 |
@@ -1,6 +1,6 @@ |
| 109 |
# Copyright 1999-2014 Gentoo Foundation |
| 110 |
# Distributed under the terms of the GNU General Public License v2 |
| 111 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.71 2014/05/25 17:34:03 vapier Exp $ |
| 112 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.72 2014/05/31 16:02:42 vapier Exp $ |
| 113 |
|
| 114 |
EAPI=5 |
| 115 |
|
| 116 |
@@ -448,16 +448,6 @@ |
| 117 |
udev_dorules "${FILESDIR}"/65-kvm.rules |
| 118 |
fi |
| 119 |
|
| 120 |
- if use qemu_softmmu_targets_x86_64 ; then |
| 121 |
- newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm |
| 122 |
- ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed" |
| 123 |
- ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" |
| 124 |
- ewarn "your libvirt configs or other wrappers for ${PN}" |
| 125 |
- elif use x86 || use amd64; then |
| 126 |
- elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" |
| 127 |
- elog "of the /usr/bin/qemu-kvm script." |
| 128 |
- fi |
| 129 |
- |
| 130 |
if use python; then |
| 131 |
python_foreach_impl qemu_python_install |
| 132 |
fi |
| 133 |
@@ -528,6 +518,13 @@ |
| 134 |
ewarn "any saved states with a newer qemu." |
| 135 |
ewarn |
| 136 |
ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x" |
| 137 |
+ |
| 138 |
+ if use x86 || use amd64; then |
| 139 |
+ ewarn |
| 140 |
+ ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer" |
| 141 |
+ ewarn "installed. In order to use kvm acceleration, pass the flag" |
| 142 |
+ ewarn "-enable-kvm when running your system target." |
| 143 |
+ fi |
| 144 |
fi |
| 145 |
|
| 146 |
virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid," |
Archives