[arch-commits] Commit in qemu/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Tuesday, July 22, 2008 @ 16:19:49
  Author: eric
Revision: 6019

Merged revisions 1033-6018 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/qemu/trunk

........
  r5978 | paul | 2008-07-22 08:08:09 -0400 (Tue, 22 Jul 2008) | 2 lines
  
  upgpkg: qemu 0.9.1-5
      switched to kvm bios file, closing #10219
........

Modified:
  qemu/repos/extra-x86_64/	(properties)
  qemu/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


Property changes on: qemu/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /qemu/trunk:1-1032
   + /qemu/trunk:1-6018

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-22 20:16:49 UTC (rev 6018)
+++ extra-x86_64/PKGBUILD	2008-07-22 20:19:49 UTC (rev 6019)
@@ -2,7 +2,7 @@
 # Maintainer: Thomas B�chler <thomas at archlinux.org>
 pkgname=qemu
 pkgver=0.9.1
-pkgrel=4
+pkgrel=5
 _kvmver=67
 pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@
 depends=('sdl' 'alsa-lib' 'zlib' 'e2fsprogs' 'gnutls')
 makedepends=('gcc34')
 install=qemu.install
-source=(http://fabrice.bellard.free.fr/qemu/${pkgname}-${pkgver}.tar.gz \
+source=(http://bellard.org/${pkgname}/${pkgname}-${pkgver}.tar.gz \
         70-kqemu.rules \
         http://downloads.sourceforge.net/kvm/kvm-$_kvmver.tar.gz)
 
@@ -38,9 +38,9 @@
   # we add the kvm/qemu version
     cd ${startdir}/src/kvm-$_kvmver
     ./configure --prefix=/usr --enable-alsa
-  # fix sdl compilation
+  # fix sdl compilation, JON: and extboot
     sed -i -e 's#-rpath,/usr/lib#-rpath,/usr/lib,-rpath,/lib#g' qemu/config-host.mak
-    for dir in libkvm user qemu; do
+    for dir in libkvm user qemu extboot; do
       cd ${startdir}/src/kvm-$_kvmver/${dir}
       make || return 1
     done
@@ -52,6 +52,9 @@
    # install kvm bios files
    cp -f ${startdir}/src/kvm-$_kvmver/qemu/pc-bios/* \
 	${startdir}/pkg/usr/share/qemu/
+   # JON: install extboot.bin
+    cp -f ${startdir}/src/kvm-$_kvmver/extboot/extboot.bin \
+	${startdir}/pkg/usr/share/qemu/
 }
 md5sums=('6591df8e9270eb358c881de4ebea1262'
          'ec06591830b8fcf53913f05f3d66f7e5'