[arch-commits] Commit in qemu/trunk (65-kvm.rules PKGBUILD)

[Thomas Bächler]

    Date: Friday, November 1, 2013 @ 09:14:26
  Author: thomas
Revision: 198648

upgpkg: qemu 1.6.1-2

* fix udev rule
* fix PKGBUILD
* fix build with make 4 (qemu build system bug)

Modified:
  qemu/trunk/65-kvm.rules
  qemu/trunk/PKGBUILD

--------------+
 65-kvm.rules |    2 +-
 PKGBUILD     |   15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

Modified: 65-kvm.rules
===================================================================
--- 65-kvm.rules	2013-10-31 21:37:33 UTC (rev 198647)
+++ 65-kvm.rules	2013-11-01 08:14:26 UTC (rev 198648)
@@ -1,2 +1,2 @@
 KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-31 21:37:33 UTC (rev 198647)
+++ PKGBUILD	2013-11-01 08:14:26 UTC (rev 198648)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=('qemu' 'libcacard')
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
@@ -10,12 +10,21 @@
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
         65-kvm.rules)
+makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+             'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+             'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+             'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2')
 replaces=('qemu-kvm')
 options=(!strip)
+md5sums=('3a897d722457c5a895cd6ac79a28fda0'
+         '33ab286a20242dda7743a900f369d68a')
 
 build ()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # qemu vs. make 4 == bad
+  export ARFLAGS="rv"
+  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
   # gtk gui breaks keymappings at the moment
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
               --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
@@ -22,7 +31,7 @@
               --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \
               --disable-gtk --enable-linux-aio --enable-seccomp \
               --enable-spice --localstatedir=/var
-              make
+  make V=99
 }
 
 package_qemu() {
@@ -73,5 +82,3 @@
  cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
  cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
 }
-md5sums=('3a897d722457c5a895cd6ac79a28fda0'
-         '9d6de26867a05c306157e3d3c612b28a')