[arch-commits] Commit in kvm/repos (extra-i686 extra-i686/PKGBUILD)

[Tobias Powalowski]

    Date: Sunday, April 12, 2009 @ 11:08:14
  Author: tpowa
Revision: 35360

Merged revisions 34638,35343 via svnmerge from 
svn+ssh://tpowa@archlinux.org/srv/svn-packages/kvm/trunk

........
  r34638 | tpowa | 2009-04-10 17:59:43 +0000 (Fr, 10 Apr 2009) | 2 lines
  
  'added propset'
........
  r35343 | tpowa | 2009-04-12 14:31:54 +0000 (So, 12 Apr 2009) | 1 line
  
  upgpkg: kvm 84-2
........

Modified:
  kvm/repos/extra-i686/	(properties)
  kvm/repos/extra-i686/PKGBUILD	(contents, properties)

----------+
 PKGBUILD |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)


Property changes on: kvm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /kvm/trunk:1-34635
   + /kvm/trunk:1-35358

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-12 15:07:29 UTC (rev 35359)
+++ extra-i686/PKGBUILD	2009-04-12 15:08:14 UTC (rev 35360)
@@ -1,8 +1,8 @@
-# $Id:$
+# $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=kvm
 pkgver=84
-pkgrel=1
+pkgrel=2
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL2')
@@ -24,11 +24,12 @@
         cd ${srcdir}/kvm-${pkgver}/${dir}
         make || return 1
     done
-    # install kvm-qemu
+    # install qemu-kvm
     install -D -m 755 ${srcdir}/${pkgname}-${pkgver}/qemu/x86_64-softmmu/qemu-system-x86_64 \
         ${pkgdir}/usr/bin/qemu-kvm
-    install -D -m644 ${srcdir}/${pkgname}-${pkgver}/scripts/65-kvm.rules \
-        ${pkgdir}/etc/udev/rules.d/65-kvm.rules || return 1
+    # install qemu-img and qemu-nbd
+    install -D -m 755 ${srcdir}/${pkgname}-${pkgver}/qemu/{qemu-nbd,qemu-img} \
+        ${pkgdir}/usr/bin/
     # install kvm bios files
     install -D -m644 ${srcdir}/${pkgname}-${pkgver}/qemu/pc-bios/bios.bin \
         ${pkgdir}/usr/share/qemu/bios.bin
@@ -38,6 +39,10 @@
         ${pkgdir}/usr/share/qemu/vgabios-cirrus.bin
     install -D -m644 ${srcdir}/${pkgname}-${pkgver}/extboot/extboot.bin \
          ${pkgdir}/usr/share/qemu/extboot.bin
+    # install keymap files
+    for i in ${srcdir}/${pkgname}-${pkgver}/qemu/keymaps/*; do
+        install -D -m644 $i ${pkgdir}/usr/share/qemu/keymaps/$(basename $i)
+    done
     # install udev rules
     install -D -m644 ${srcdir}/70-kqemu.rules \
                      ${pkgdir}/lib/udev/rules.d/70-kqemu.rules


Property changes on: kvm/repos/extra-i686/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id