diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-08-05 06:43:00 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-08-05 06:43:00 +0000 |
| commit | 592711f0613957443eae463283b97d898ea6ab45 (patch) | |
| tree | 63bc35c17bb9c2b4c0d64187fc07db5987b0845a /app-emulation | |
| parent | Version bump. (diff) | |
| download | gentoo-2-592711f0613957443eae463283b97d898ea6ab45.tar.gz gentoo-2-592711f0613957443eae463283b97d898ea6ab45.tar.bz2 gentoo-2-592711f0613957443eae463283b97d898ea6ab45.zip | |
Move seabios bin clean up under the softmmu check since user tools do not install blobs.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/qemu/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-2.3.0-r5.ebuild | 16 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 16 |
3 files changed, 22 insertions, 17 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index ed0cce0f5c63..6c1cdaf07b9a 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.346 2015/08/05 06:27:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.347 2015/08/05 06:43:00 vapier Exp $ + + 05 Aug 2015; Mike Frysinger <vapier@gentoo.org> qemu-2.3.0-r5.ebuild, + qemu-9999.ebuild: + Move seabios bin clean up under the softmmu check since user tools do not + install blobs. 05 Aug 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild: Unify target logic a bit. diff --git a/app-emulation/qemu/qemu-2.3.0-r5.ebuild b/app-emulation/qemu/qemu-2.3.0-r5.ebuild index c15040a84c7b..143c594d2d7f 100644 --- a/app-emulation/qemu/qemu-2.3.0-r5.ebuild +++ b/app-emulation/qemu/qemu-2.3.0-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r5.ebuild,v 1.3 2015/08/04 08:19:33 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r5.ebuild,v 1.4 2015/08/05 06:43:00 vapier Exp $ EAPI=5 @@ -528,14 +528,14 @@ src_install() { newdoc pc-bios/README README.pc-bios dodoc docs/qmp/*.txt - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - fi - - # Remove vgabios since we're using the vgabios packaged one if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + fi + + # Remove vgabios since we're using the vgabios packaged one rm "${ED}/usr/share/qemu/vgabios.bin" rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" rm "${ED}/usr/share/qemu/vgabios-qxl.bin" diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 57a8d128a88c..c0948c65b2f0 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.104 2015/08/05 06:27:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.105 2015/08/05 06:43:00 vapier Exp $ EAPI=5 @@ -522,14 +522,14 @@ src_install() { newdoc pc-bios/README README.pc-bios dodoc docs/qmp/*.txt - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - fi - - # Remove vgabios since we're using the vgabios packaged one if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + fi + + # Remove vgabios since we're using the vgabios packaged one rm "${ED}/usr/share/qemu/vgabios.bin" rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" rm "${ED}/usr/share/qemu/vgabios-qxl.bin" |