summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-07-22 04:35:00 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-07-22 04:35:00 +0000
commit78b37a701cf76a2a506857ec3846555cb677ce0b (patch)
tree5da9649a5a76823a4c8994e26e4453ac95c47344 /app-emulation/qemu-kvm
parentAdd initial version (diff)
downloadgentoo-2-78b37a701cf76a2a506857ec3846555cb677ce0b.tar.gz
gentoo-2-78b37a701cf76a2a506857ec3846555cb677ce0b.tar.bz2
gentoo-2-78b37a701cf76a2a506857ec3846555cb677ce0b.zip
Use packaged sgabios instead of what QEMU ships with.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/qemu-kvm')
-rw-r--r--app-emulation/qemu-kvm/ChangeLog5
-rw-r--r--app-emulation/qemu-kvm/qemu-kvm-9999.ebuild13
2 files changed, 12 insertions, 6 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 5a70ab41f361..c26744eb4d3a 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.140 2012/07/22 03:57:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.141 2012/07/22 04:35:00 cardoe Exp $
+
+ 22 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+ Use packaged sgabios instead of what QEMU ships with.
21 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.1-r1.ebuild,
qemu-kvm-9999.ebuild:
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 26fac0f0fc42..a34aa441a468 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.47 2012/07/22 03:57:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.48 2012/07/22 04:35:00 cardoe Exp $
EAPI="4"
@@ -62,11 +62,10 @@ RDEPEND="
>=dev-libs/glib-2.0
media-libs/libpng
sys-apps/pciutils
+ >=sys-apps/seabios-1.7.0
+ sys-apps/sgabios
+ sys-apps/vgabios
virtual/jpeg
- amd64? ( >=sys-apps/seabios-1.7.0
- sys-apps/vgabios )
- x86? ( >=sys-apps/seabios-1.7.0
- sys-apps/vgabios )
aio? ( dev-libs/libaio )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
@@ -346,6 +345,10 @@ src_install() {
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+
+ # Remove sgabios since we're using the sgabios packaged one
+ rm "${ED}/usr/share/qemu/sgabios.bin"
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
}
pkg_postinst() {