Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-2.0.0-r1.ebuild qemu-2.0.0.ebuild qemu-9999.ebuild ChangeLog
Date: Wed, 04 Jun 2014 20:45:09
Message-Id: 20140604204506.43E672004E@flycatcher.gentoo.org
1 vapier 14/06/04 20:45:06
2
3 Modified: qemu-2.0.0-r1.ebuild qemu-2.0.0.ebuild
4 qemu-9999.ebuild ChangeLog
5 Log:
6 Fix src_test when softmmu is disabled. Fix install of test results when generating them failed #512010 by Markus Oehme.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
9
10 Revision Changes Path
11 1.4 app-emulation/qemu/qemu-2.0.0-r1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?r1=1.3&r2=1.4
16
17 Index: qemu-2.0.0-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- qemu-2.0.0-r1.ebuild 4 Jun 2014 15:36:23 -0000 1.3
24 +++ qemu-2.0.0-r1.ebuild 4 Jun 2014 20:45:06 -0000 1.4
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-2.0.0-r1.ebuild,v 1.3 2014/06/04 15:36:23 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.4 2014/06/04 20:45:06 vapier Exp $
30
31 EAPI=5
32
33 @@ -427,9 +427,11 @@
34 }
35
36 src_test() {
37 - cd "${S}/softmmu-build"
38 - emake -j1 check
39 - emake -j1 check-report.html
40 + if [[ -n ${softmmu_targets} ]]; then
41 + cd "${S}/softmmu-build"
42 + emake -j1 check
43 + emake -j1 check-report.html
44 + fi
45 }
46
47 qemu_python_install() {
48 @@ -454,9 +456,8 @@
49 cd "${S}/softmmu-build"
50 emake DESTDIR="${ED}" install
51
52 - if use test; then
53 - dohtml check-report.html
54 - fi
55 + # This might not exist if the test failed. #512010
56 + [[ -e check-report.html ]] && dohtml check-report.html
57
58 if use kernel_linux; then
59 udev_dorules "${FILESDIR}"/65-kvm.rules
60
61
62
63 1.12 app-emulation/qemu/qemu-2.0.0.ebuild
64
65 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.12&view=markup
66 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.12&content-type=text/plain
67 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?r1=1.11&r2=1.12
68
69 Index: qemu-2.0.0.ebuild
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v
72 retrieving revision 1.11
73 retrieving revision 1.12
74 diff -u -r1.11 -r1.12
75 --- qemu-2.0.0.ebuild 4 Jun 2014 16:04:51 -0000 1.11
76 +++ qemu-2.0.0.ebuild 4 Jun 2014 20:45:06 -0000 1.12
77 @@ -1,6 +1,6 @@
78 # Copyright 1999-2014 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.11 2014/06/04 16:04:51 ago Exp $
81 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.12 2014/06/04 20:45:06 vapier Exp $
82
83 EAPI=5
84
85 @@ -422,9 +422,11 @@
86 }
87
88 src_test() {
89 - cd "${S}/softmmu-build"
90 - emake -j1 check
91 - emake -j1 check-report.html
92 + if [[ -n ${softmmu_targets} ]]; then
93 + cd "${S}/softmmu-build"
94 + emake -j1 check
95 + emake -j1 check-report.html
96 + fi
97 }
98
99 qemu_python_install() {
100 @@ -449,9 +451,8 @@
101 cd "${S}/softmmu-build"
102 emake DESTDIR="${ED}" install
103
104 - if use test; then
105 - dohtml check-report.html
106 - fi
107 + # This might not exist if the test failed. #512010
108 + [[ -e check-report.html ]] && dohtml check-report.html
109
110 if use kernel_linux; then
111 udev_dorules "${FILESDIR}"/65-kvm.rules
112
113
114
115 1.74 app-emulation/qemu/qemu-9999.ebuild
116
117 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.74&view=markup
118 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.74&content-type=text/plain
119 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.73&r2=1.74
120
121 Index: qemu-9999.ebuild
122 ===================================================================
123 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
124 retrieving revision 1.73
125 retrieving revision 1.74
126 diff -u -r1.73 -r1.74
127 --- qemu-9999.ebuild 4 Jun 2014 15:36:23 -0000 1.73
128 +++ qemu-9999.ebuild 4 Jun 2014 20:45:06 -0000 1.74
129 @@ -1,6 +1,6 @@
130 # Copyright 1999-2014 Gentoo Foundation
131 # Distributed under the terms of the GNU General Public License v2
132 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.73 2014/06/04 15:36:23 vapier Exp $
133 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.74 2014/06/04 20:45:06 vapier Exp $
134
135 EAPI=5
136
137 @@ -421,9 +421,11 @@
138 }
139
140 src_test() {
141 - cd "${S}/softmmu-build"
142 - emake -j1 check
143 - emake -j1 check-report.html
144 + if [[ -n ${softmmu_targets} ]]; then
145 + cd "${S}/softmmu-build"
146 + emake -j1 check
147 + emake -j1 check-report.html
148 + fi
149 }
150
151 qemu_python_install() {
152 @@ -448,9 +450,8 @@
153 cd "${S}/softmmu-build"
154 emake DESTDIR="${ED}" install
155
156 - if use test; then
157 - dohtml check-report.html
158 - fi
159 + # This might not exist if the test failed. #512010
160 + [[ -e check-report.html ]] && dohtml check-report.html
161
162 if use kernel_linux; then
163 udev_dorules "${FILESDIR}"/65-kvm.rules
164
165
166
167 1.267 app-emulation/qemu/ChangeLog
168
169 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.267&view=markup
170 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.267&content-type=text/plain
171 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.266&r2=1.267
172
173 Index: ChangeLog
174 ===================================================================
175 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
176 retrieving revision 1.266
177 retrieving revision 1.267
178 diff -u -r1.266 -r1.267
179 --- ChangeLog 4 Jun 2014 16:04:51 -0000 1.266
180 +++ ChangeLog 4 Jun 2014 20:45:06 -0000 1.267
181 @@ -1,6 +1,11 @@
182 # ChangeLog for app-emulation/qemu
183 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
184 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.266 2014/06/04 16:04:51 ago Exp $
185 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.267 2014/06/04 20:45:06 vapier Exp $
186 +
187 + 04 Jun 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild,
188 + qemu-2.0.0.ebuild, qemu-9999.ebuild:
189 + Fix src_test when softmmu is disabled. Fix install of test results when
190 + generating them failed #512010 by Markus Oehme.
191
192 04 Jun 2014; Agostino Sarubbo <ago@g.o> qemu-2.0.0.ebuild:
193 Stable for x86, wrt bug #507796
Report Message
Find on MARC Find on Google Groups