vapier 14/06/04 20:45:06
Modified: qemu-2.0.0-r1.ebuild qemu-2.0.0.ebuild
qemu-9999.ebuild ChangeLog
Log:
Fix src_test when softmmu is disabled. Fix install of test results when
generating them failed #512010 by Markus Oehme.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.4 app-emulation/qemu/qemu-2.0.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.4&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?r1=1.3&r2=1.4
Index: qemu-2.0.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qemu-2.0.0-r1.ebuild 4 Jun 2014 15:36:23 -0000 1.3
+++ qemu-2.0.0-r1.ebuild 4 Jun 2014 20:45:06 -0000 1.4
@@ -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-r1.ebuild,v
1.3 2014/06/04 15:36:23 vapier Exp $
+# $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 $
EAPI=5
@@ -427,9 +427,11 @@
}
src_test() {
- cd "${S}/softmmu-build"
- emake -j1 check
- emake -j1 check-report.html
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ emake -j1 check
+ emake -j1 check-report.html
+ fi
}
qemu_python_install() {
@@ -454,9 +456,8 @@
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
- if use test; then
- dohtml check-report.html
- fi
+ # This might not exist if the test failed. #512010
+ [[ -e check-report.html ]] && dohtml check-report.html
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
1.12 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.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?r1=1.11&r2=1.12
Index: qemu-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qemu-2.0.0.ebuild 4 Jun 2014 16:04:51 -0000 1.11
+++ qemu-2.0.0.ebuild 4 Jun 2014 20:45:06 -0000 1.12
@@ -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.11
2014/06/04 16:04:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.12
2014/06/04 20:45:06 vapier Exp $
EAPI=5
@@ -422,9 +422,11 @@
}
src_test() {
- cd "${S}/softmmu-build"
- emake -j1 check
- emake -j1 check-report.html
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ emake -j1 check
+ emake -j1 check-report.html
+ fi
}
qemu_python_install() {
@@ -449,9 +451,8 @@
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
- if use test; then
- dohtml check-report.html
- fi
+ # This might not exist if the test failed. #512010
+ [[ -e check-report.html ]] && dohtml check-report.html
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
1.74 app-emulation/qemu/qemu-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.74&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.74&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.73&r2=1.74
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- qemu-9999.ebuild 4 Jun 2014 15:36:23 -0000 1.73
+++ qemu-9999.ebuild 4 Jun 2014 20:45:06 -0000 1.74
@@ -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.73
2014/06/04 15:36:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.74
2014/06/04 20:45:06 vapier Exp $
EAPI=5
@@ -421,9 +421,11 @@
}
src_test() {
- cd "${S}/softmmu-build"
- emake -j1 check
- emake -j1 check-report.html
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ emake -j1 check
+ emake -j1 check-report.html
+ fi
}
qemu_python_install() {
@@ -448,9 +450,8 @@
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
- if use test; then
- dohtml check-report.html
- fi
+ # This might not exist if the test failed. #512010
+ [[ -e check-report.html ]] && dohtml check-report.html
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
1.267 app-emulation/qemu/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.267&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.267&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.266&r2=1.267
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- ChangeLog 4 Jun 2014 16:04:51 -0000 1.266
+++ ChangeLog 4 Jun 2014 20:45:06 -0000 1.267
@@ -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.266
2014/06/04 16:04:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.267
2014/06/04 20:45:06 vapier Exp $
+
+ 04 Jun 2014; Mike Frysinger <[email protected]> qemu-2.0.0-r1.ebuild,
+ qemu-2.0.0.ebuild, qemu-9999.ebuild:
+ Fix src_test when softmmu is disabled. Fix install of test results when
+ generating them failed #512010 by Markus Oehme.
04 Jun 2014; Agostino Sarubbo <[email protected]> qemu-2.0.0.ebuild:
Stable for x86, wrt bug #507796
