[arch-commits] Commit in qemu/repos (4 files)

Tobias Powalowski tpowa at archlinux.org
Sun Jan 24 05:53:55 EST 2010


    Date: Sunday, January 24, 2010 @ 05:53:55
  Author: tpowa
Revision: 65101

Merged revisions 65093 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qemu/trunk

........
  r65093 | tpowa | 2010-01-24 11:39:24 +0100 (So, 24 Jan 2010) | 2 lines
  
  upgpkg: qemu 0.12.2-1
      bump to latest version
........

Modified:
  qemu/repos/extra-x86_64/	(properties)
  qemu/repos/extra-x86_64/PKGBUILD
  qemu/repos/extra-x86_64/qemu.install
Deleted:
  qemu/repos/extra-x86_64/70-kqemu.rules

----------------+
 70-kqemu.rules |    1 -
 PKGBUILD       |   14 ++++++--------
 qemu.install   |   13 ++++++-------
 3 files changed, 12 insertions(+), 16 deletions(-)


Property changes on: qemu/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /qemu/trunk:1-62252
   + /qemu/trunk:1-65098

Deleted: extra-x86_64/70-kqemu.rules
===================================================================
--- extra-x86_64/70-kqemu.rules	2010-01-24 10:53:39 UTC (rev 65100)
+++ extra-x86_64/70-kqemu.rules	2010-01-24 10:53:55 UTC (rev 65101)
@@ -1 +0,0 @@
-KERNEL=="kqemu", MODE="0666"

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-01-24 10:53:39 UTC (rev 65100)
+++ extra-x86_64/PKGBUILD	2010-01-24 10:53:55 UTC (rev 65101)
@@ -1,17 +1,17 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=qemu
-pkgver=0.12.1
+pkgver=0.12.2
 pkgrel=1
 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=('GPL2' 'LGPL2.1')
 url="http://www.nongnu.org/qemu/"
+makedepends=('texi2html' 'perl')
 depends=('sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl')
 install=qemu.install
 source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        65-kvm.rules
-        70-kqemu.rules)
+        65-kvm.rules)
 
 build()
 {
@@ -19,14 +19,12 @@
   sed -i -e 's/lib64/lib/g' x86_64.ld || return 1
   ./configure --prefix=/usr --audio-drv-list=oss,alsa,sdl,esd \
               --audio-card-list=ac97,sb16,es1370,adlib \
+              --enable-docs \
               --kerneldir="/usr/src/linux-$(uname -r)"
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ${srcdir}/70-kqemu.rules \
-                   ${pkgdir}/lib/udev/rules.d/70-kqemu.rules
   install -D -m644 ${srcdir}/65-kvm.rules \
                    ${pkgdir}/lib/udev/rules.d/65-kvm.rules
 }
-md5sums=('df9a979ac72251036b7d0794895233a5'
-         'cead7ba387159d360f892281499975df'
-         'ec06591830b8fcf53913f05f3d66f7e5')
+md5sums=('1d7c2d95acb6d0789de86508c608e26d'
+         'cead7ba387159d360f892281499975df')

Modified: extra-x86_64/qemu.install
===================================================================
--- extra-x86_64/qemu.install	2010-01-24 10:53:39 UTC (rev 65100)
+++ extra-x86_64/qemu.install	2010-01-24 10:53:55 UTC (rev 65101)
@@ -2,17 +2,16 @@
 post_install() {
   #
   groupadd kvm -f -g 78
-  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 --enable-kvm' to use KVM."
+  echo ">>>  Use 'qemu -enable-kvm' to use KVM."
   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."
+  if [ "$(vercmp $2 0.11)" -lt 0 ]; then
+    echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
+    echo "is no longer supported and will be removed from the repositories. You"
+    echo "can safely uninstall it from your system."
+  fi
 }
 
 post_upgrade() {



More information about the arch-commits mailing list