public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Doug Goldstein (cardoe)" <cardoe@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild
Date: Sun, 22 Jul 2012 04:35:00 +0000 (UTC)	[thread overview]
Message-ID: <20120722043500.375D12004B@flycatcher.gentoo.org> (raw)

cardoe      12/07/22 04:35:00

  Modified:             ChangeLog qemu-kvm-9999.ebuild
  Log:
  Use packaged sgabios instead of what QEMU ships with.
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.141                app-emulation/qemu-kvm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.140&r2=1.141

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog	22 Jul 2012 03:57:25 -0000	1.140
+++ ChangeLog	22 Jul 2012 04:35:00 -0000	1.141
@@ -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:



1.48                 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.47&r2=1.48

Index: qemu-kvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- qemu-kvm-9999.ebuild	22 Jul 2012 03:57:25 -0000	1.47
+++ qemu-kvm-9999.ebuild	22 Jul 2012 04:35:00 -0000	1.48
@@ -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 @@
 	>=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 @@
 	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() {





             reply	other threads:[~2012-07-22  4:35 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-22  4:35 Doug Goldstein (cardoe) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-09-10 21:39 [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-9999.ebuild Doug Goldstein (cardoe)
2012-08-25 22:38 Doug Goldstein (cardoe)
2012-08-12 23:42 Doug Goldstein (cardoe)
2012-08-12 22:13 Doug Goldstein (cardoe)
2012-07-28 22:04 Doug Goldstein (cardoe)
2012-07-11  2:01 Doug Goldstein (cardoe)
2012-07-08 22:07 Doug Goldstein (cardoe)
2012-01-22 22:49 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2012-01-17 22:25 Doug Goldstein (cardoe)
2011-10-21  3:13 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2011-08-11 19:25 Doug Goldstein (cardoe)
2010-09-06 11:07 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-09-06  3:06 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-06-12  5:20 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-03-28 17:24 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2010-03-07  3:15 Jorge Manuel B. S. Vicetto (jmbsvicetto)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120722043500.375D12004B@flycatcher.gentoo.org \
    --to=cardoe@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox