1 |
vapier 14/06/04 15:36:23 |
2 |
|
3 |
Modified: qemu-9999.ebuild qemu-2.0.0.ebuild |
4 |
qemu-2.0.0-r1.ebuild ChangeLog |
5 |
Log: |
6 |
Check for config files still using `qemu-kvm`. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
9 |
|
10 |
Revision Changes Path |
11 |
1.73 app-emulation/qemu/qemu-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.73&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.73&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.72&r2=1.73 |
16 |
|
17 |
Index: qemu-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v |
20 |
retrieving revision 1.72 |
21 |
retrieving revision 1.73 |
22 |
diff -u -r1.72 -r1.73 |
23 |
--- qemu-9999.ebuild 31 May 2014 16:02:42 -0000 1.72 |
24 |
+++ qemu-9999.ebuild 4 Jun 2014 15:36:23 -0000 1.73 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.72 2014/05/31 16:02:42 vapier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.73 2014/06/04 15:36:23 vapier Exp $ |
30 |
|
31 |
EAPI=5 |
32 |
|
33 |
@@ -216,6 +216,14 @@ |
34 |
check_extra_config |
35 |
fi |
36 |
fi |
37 |
+ |
38 |
+ if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then |
39 |
+ eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" |
40 |
+ eerror "instances are still pointing to it. Please update your" |
41 |
+ eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" |
42 |
+ eerror "and the right system binary (e.g. qemu-system-x86_64)." |
43 |
+ die "update your virt configs to not use qemu-kvm" |
44 |
+ fi |
45 |
} |
46 |
|
47 |
pkg_setup() { |
48 |
|
49 |
|
50 |
|
51 |
1.9 app-emulation/qemu/qemu-2.0.0.ebuild |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.9&view=markup |
54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.9&content-type=text/plain |
55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?r1=1.8&r2=1.9 |
56 |
|
57 |
Index: qemu-2.0.0.ebuild |
58 |
=================================================================== |
59 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v |
60 |
retrieving revision 1.8 |
61 |
retrieving revision 1.9 |
62 |
diff -u -r1.8 -r1.9 |
63 |
--- qemu-2.0.0.ebuild 31 May 2014 16:14:44 -0000 1.8 |
64 |
+++ qemu-2.0.0.ebuild 4 Jun 2014 15:36:23 -0000 1.9 |
65 |
@@ -1,6 +1,6 @@ |
66 |
# Copyright 1999-2014 Gentoo Foundation |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.8 2014/05/31 16:14:44 vapier Exp $ |
69 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.9 2014/06/04 15:36:23 vapier Exp $ |
70 |
|
71 |
EAPI=5 |
72 |
|
73 |
@@ -216,6 +216,14 @@ |
74 |
check_extra_config |
75 |
fi |
76 |
fi |
77 |
+ |
78 |
+ if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then |
79 |
+ eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" |
80 |
+ eerror "instances are still pointing to it. Please update your" |
81 |
+ eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" |
82 |
+ eerror "and the right system binary (e.g. qemu-system-x86_64)." |
83 |
+ die "update your virt configs to not use qemu-kvm" |
84 |
+ fi |
85 |
} |
86 |
|
87 |
pkg_setup() { |
88 |
|
89 |
|
90 |
|
91 |
1.3 app-emulation/qemu/qemu-2.0.0-r1.ebuild |
92 |
|
93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.3&view=markup |
94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.3&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?r1=1.2&r2=1.3 |
96 |
|
97 |
Index: qemu-2.0.0-r1.ebuild |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v |
100 |
retrieving revision 1.2 |
101 |
retrieving revision 1.3 |
102 |
diff -u -r1.2 -r1.3 |
103 |
--- qemu-2.0.0-r1.ebuild 31 May 2014 16:14:44 -0000 1.2 |
104 |
+++ qemu-2.0.0-r1.ebuild 4 Jun 2014 15:36:23 -0000 1.3 |
105 |
@@ -1,6 +1,6 @@ |
106 |
# Copyright 1999-2014 Gentoo Foundation |
107 |
# Distributed under the terms of the GNU General Public License v2 |
108 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.2 2014/05/31 16:14:44 vapier Exp $ |
109 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.3 2014/06/04 15:36:23 vapier Exp $ |
110 |
|
111 |
EAPI=5 |
112 |
|
113 |
@@ -216,6 +216,14 @@ |
114 |
check_extra_config |
115 |
fi |
116 |
fi |
117 |
+ |
118 |
+ if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then |
119 |
+ eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" |
120 |
+ eerror "instances are still pointing to it. Please update your" |
121 |
+ eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" |
122 |
+ eerror "and the right system binary (e.g. qemu-system-x86_64)." |
123 |
+ die "update your virt configs to not use qemu-kvm" |
124 |
+ fi |
125 |
} |
126 |
|
127 |
pkg_setup() { |
128 |
|
129 |
|
130 |
|
131 |
1.264 app-emulation/qemu/ChangeLog |
132 |
|
133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.264&view=markup |
134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.264&content-type=text/plain |
135 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.263&r2=1.264 |
136 |
|
137 |
Index: ChangeLog |
138 |
=================================================================== |
139 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v |
140 |
retrieving revision 1.263 |
141 |
retrieving revision 1.264 |
142 |
diff -u -r1.263 -r1.264 |
143 |
--- ChangeLog 31 May 2014 16:14:44 -0000 1.263 |
144 |
+++ ChangeLog 4 Jun 2014 15:36:23 -0000 1.264 |
145 |
@@ -1,6 +1,10 @@ |
146 |
# ChangeLog for app-emulation/qemu |
147 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
148 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.263 2014/05/31 16:14:44 vapier Exp $ |
149 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.264 2014/06/04 15:36:23 vapier Exp $ |
150 |
+ |
151 |
+ 04 Jun 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild, |
152 |
+ qemu-2.0.0.ebuild, qemu-9999.ebuild: |
153 |
+ Check for config files still using `qemu-kvm`. |
154 |
|
155 |
31 May 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild, |
156 |
qemu-2.0.0.ebuild: |