[arch-commits] Commit in qemu/trunk (PKGBUILD qemu.install)

[Tobias Powalowski]

    Date: Wednesday, April 8, 2009 @ 10:16:24
  Author: tpowa
Revision: 34244

upgpkg: qemu 0.10.2-1

Modified:
  qemu/trunk/PKGBUILD
  qemu/trunk/qemu.install

--------------+
 PKGBUILD     |   48 +++++++++---------------------------------------
 qemu.install |   14 +++-----------
 2 files changed, 12 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-08 14:16:17 UTC (rev 34243)
+++ PKGBUILD	2009-04-08 14:16:24 UTC (rev 34244)
@@ -1,58 +1,28 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=qemu
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
-_kvmver=84
 pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
-license=('GPL')
-url="http://bellard.org/qemu/"
+license=('GPL2' 'LGPL2')
+url="http://www.nongnu.org/qemu/"
 depends=('sdl' 'alsa-lib' 'esound' 'zlib' 'e2fsprogs' 'gnutls>=2.4.1' 'bluez')
 install=qemu.install
 source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        70-kqemu.rules
-        http://downloads.sourceforge.net/kvm/kvm-$_kvmver.tar.gz
-        kvm-bios.diff)
+        70-kqemu.rules)
 
 build()
 {
   cd ${srcdir}/${pkgname}-${pkgver}
-  unset CFLAGS
   sed -i -e 's/lib64/lib/g' x86_64.ld || return 1
-  ./configure --prefix=/usr --audio-drv-list=oss,alsa,sdl,esd
+  ./configure --prefix=/usr --audio-drv-list=oss,alsa,sdl,esd \
+              --kerneldir="/usr/src/linux-$(uname -r)"
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
   install -D -m644 ${srcdir}/70-kqemu.rules \
-                   ${pkgdir}/etc/udev/rules.d/70-kqemu.rules
+                   ${pkgdir}/lib/udev/rules.d/70-kqemu.rules
 
-  # we add the kvm/qemu version
-    cd ${srcdir}/kvm-$_kvmver
-    # fix bios versions
-    patch -Np1 -i ../kvm-bios.diff || return 1
-    ./configure --prefix=/usr --audio-drv-list=oss,alsa,sdl,esd
-  # 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 extboot; do
-      cd ${srcdir}/kvm-$_kvmver/${dir}
-      make || return 1
-    done
-   # install kvm-qemu
-    install -m 755 ${srcdir}/kvm-$_kvmver/qemu/x86_64-softmmu/qemu-system-x86_64 \
-        ${pkgdir}/usr/bin/qemu-kvm
-    install -D -m644 ${srcdir}/kvm-$_kvmver/scripts/65-kvm.rules \
-    	${pkgdir}/etc/udev/rules.d/65-kvm.rules || return 1
-   # install kvm bios files
-   install -D -m644 ${srcdir}/kvm-$_kvmver/qemu/pc-bios/bios.bin \
-       ${pkgdir}/usr/share/qemu/bios-kvm.bin
-   install -D -m644 ${srcdir}/kvm-$_kvmver/qemu/pc-bios/vgabios.bin \
-       ${pkgdir}/usr/share/qemu/vgabios-kvm.bin
-   install -D -m644 ${srcdir}/kvm-$_kvmver/qemu/pc-bios/vgabios-cirrus.bin \
-       ${pkgdir}/usr/share/qemu/vgabios-cirrus-kvm.bin
-   install -D -m644 ${srcdir}/kvm-$_kvmver/extboot/extboot.bin \
-	${pkgdir}/usr/share/qemu/extboot-kvm.bin
 }
-md5sums=('99b6da099343f6a32e02211aa5925154'
-         'ec06591830b8fcf53913f05f3d66f7e5'
-         '39b7206ef400845800f081a5b901f757'
-         '1cdfcbd3cc569eec96a36d7557291fd2')
+md5sums=('85a323cdf620687f39c5328f450a547d'
+         'ec06591830b8fcf53913f05f3d66f7e5')

Modified: qemu.install
===================================================================
--- qemu.install	2009-04-08 14:16:17 UTC (rev 34243)
+++ qemu.install	2009-04-08 14:16:24 UTC (rev 34244)
@@ -2,21 +2,17 @@
 post_install() {
   #
   groupadd kvm -f -g 78
-  echo ">>> Qemu package now provides standard qemu and qemu-kvm."
+  echo ">>> Since kernel 2.6.29:"
+  echo ">>> Qemu package now provides standard qemu with kvm enabled."
   echo ""
   echo ">>> PLEASE READ FOR KVM USAGE!"
   echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
   echo ">>>  Add yourself to the group 'kvm'."
-  echo ">>>  Use 'qemu-kvm' to use KVM."
+  echo ">>>  Use 'qemu --enable-kvm' to use KVM."
   echo ""
-  echo ">>> 'qemu-kvm' flexibility:"
-  echo ">>>  You can use the qemu-kvm binary without kvm module too."
-  echo""
   echo ">>> PLEASE READ FOR KQEMU USAGE!"
   echo ">>> You need to install the 'kqemu' package for your kernel."
   echo ">>> You need to load the module to use qemu with kqemu."
-
-  /bin/true
 }
 
 post_upgrade() {
@@ -26,10 +22,6 @@
 post_remove() {
   #
   groupdel kvm
-  #
-  depmod -a
-  #
-  /bin/true
 }
 
 op=$1