[arch-commits] CVS update of extra/emulators/qemu (PKGBUILD qemu.install)

[Paul Mattal]

    Date: Monday, September 3, 2007 @ 15:23:16
  Author: paul
    Path: /home/cvs-extra/extra/emulators/qemu

Modified: PKGBUILD (1.10 -> 1.11) qemu.install (1.1 -> 1.2)

upgpkg: qemu 0.9.0-5
added kvm assigned group, updated install script language


--------------+
 PKGBUILD     |   52 +++++++++++++++++++++++++++++++++++++++-------------
 qemu.install |    5 ++---
 2 files changed, 41 insertions(+), 16 deletions(-)


Index: extra/emulators/qemu/PKGBUILD
diff -u extra/emulators/qemu/PKGBUILD:1.10 extra/emulators/qemu/PKGBUILD:1.11
--- extra/emulators/qemu/PKGBUILD:1.10	Sat Jul 28 02:47:03 2007
+++ extra/emulators/qemu/PKGBUILD	Mon Sep  3 15:23:16 2007
@@ -1,30 +1,56 @@
-# $Id: PKGBUILD,v 1.10 2007/07/28 06:47:03 eric Exp $
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
+# $Id: PKGBUILD,v 1.11 2007/09/03 19:23:16 paul Exp $
+# Maintainer: Thomas B�chler <thomas at archlinux.org>
 pkgname=qemu
 pkgver=0.9.0
-pkgrel=1
+pkgrel=5
 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://fabrice.bellard.free.fr/qemu/"
 depends=('sdl' 'alsa-lib' 'zlib')
-makedepends=('gcc3')
-source=(http://fabrice.bellard.free.fr/qemu/$pkgname-$pkgver.tar.gz \
-        70-kqemu.rules)
-md5sums=('ab11a03ba30cf4a70641f0f170473d69' 'ec06591830b8fcf53913f05f3d66f7e5')
+makedepends=('gcc34')
+install=qemu.install
+source=(http://fabrice.bellard.free.fr/qemu/${pkgname}-${pkgver}.tar.gz \
+        70-kqemu.rules \
+        http://downloads.sourceforge.net/kvm/kvm-28.tar.gz)
+md5sums=('ab11a03ba30cf4a70641f0f170473d69' 'ec06591830b8fcf53913f05f3d66f7e5'\
+         '0344ca089d2720042a6b23986b8fc81c')
 
 build()
 {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${startdir}/src/${pkgname}-${pkgver}
   unset CFLAGS
 
-  if [ "$CARCH" = "x86_64" ]; then
+  if [ "${CARCH}" = "x86_64" ]; then
      # any "xxx-user" target seems to not build on x86_64
          ./configure --prefix=/usr --enable-alsa \
-                     --target-list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu"
-    else ./configure --prefix=/usr --enable-alsa
+                     --target-list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu" \
+                     --qemu-cc=gcc-3.4
+  else 
+         ./configure --prefix=/usr --enable-alsa --qemu-cc=gcc-3.4
   fi
 
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  install -D -m644 $startdir/src/70-kqemu.rules $startdir/pkg/etc/udev/rules.d/70-kqemu.rules
+  make DESTDIR=${startdir}/pkg install || return 1
+  install -D -m644 ${startdir}/src/70-kqemu.rules \
+                   ${startdir}/pkg/etc/udev/rules.d/70-kqemu.rules
+
+  # we add the kvm/qemu version
+    cd ${startdir}/src/kvm-28
+    ./configure --prefix=/usr --qemu-cc=gcc-3.4
+
+    for dir in user qemu; do
+      cd ${startdir}/src/kvm-28/${dir}
+      make || return 1
+    done
+   # install kvm-qemu
+    if [ "${CARCH}" = "x86_64" ]; then
+      install -m 755 ${startdir}/src/kvm-28/qemu/x86_64-softmmu/qemu-system-x86_64 \
+        ${startdir}/pkg/usr/bin/qemu-system-x86_64-kvm
+    else 
+      install -m 755 ${startdir}/src/kvm-28/qemu/i386-softmmu/qemu \
+        ${startdir}/pkg/usr/bin/qemu-kvm
+    fi
+    install -D -m644 ${startdir}/src/kvm-28/scripts/65-kvm.rules \
+    	${startdir}/pkg/etc/udev/rules.d/65-kvm.rules || return 1
 }
Index: extra/emulators/qemu/qemu.install
diff -u extra/emulators/qemu/qemu.install:1.1 extra/emulators/qemu/qemu.install:1.2
--- extra/emulators/qemu/qemu.install:1.1	Mon Jul 23 15:57:33 2007
+++ extra/emulators/qemu/qemu.install	Mon Sep  3 15:23:16 2007
@@ -1,11 +1,10 @@
 # kvm:  the new package version
 post_install() {
   #
-  groupadd kvm
-  echo ">>> Qemu package now provides standard qemu and qemu-kvm"
+  groupadd kvm -f -g 78
+  echo ">>> Qemu package now provides standard qemu and qemu-kvm."
   echo ""
   echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  You need to install the 'kvm-modules' package for your kernel."
   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."