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

[Jason Chu]

On Fri, Oct 05, 2007 at 05:32:33AM -0400, Tobias Powalowski wrote:
>     Date: Friday, October 5, 2007 @ 05:32:33
>   Author: tpowa
>     Path: /home/cvs-extra/extra/emulators/qemu
> 
> Modified: PKGBUILD (1.14 -> 1.15) qemu.install (1.3 -> 1.4)
> 
> 'upgpgk: brought 686 and x64 in sync'
> 
> 
> --------------+
>  PKGBUILD     |   11 +++--------
>  qemu.install |    6 +-----
>  2 files changed, 4 insertions(+), 13 deletions(-)
> 
> 
> Index: extra/emulators/qemu/PKGBUILD
> diff -u extra/emulators/qemu/PKGBUILD:1.14 extra/emulators/qemu/PKGBUILD:1.15
> --- extra/emulators/qemu/PKGBUILD:1.14	Fri Oct  5 03:33:46 2007
> +++ extra/emulators/qemu/PKGBUILD	Fri Oct  5 05:32:32 2007
> @@ -1,8 +1,8 @@
> -# $Id: PKGBUILD,v 1.14 2007/10/05 07:33:46 tpowa Exp $
> +# $Id: PKGBUILD,v 1.15 2007/10/05 09:32:32 tpowa Exp $
>  # Maintainer: Thomas B�chler <thomas at archlinux.org>
>  pkgname=qemu
>  pkgver=0.9.0
> -pkgrel=8
> +pkgrel=9
>  _kvmver=45
>  pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
>  arch=(i686 x86_64)
> @@ -36,20 +36,15 @@
>  
>    # we add the kvm/qemu version
>      cd ${startdir}/src/kvm-$_kvmver
> -    ./configure --prefix=/usr --qemu-cc=gcc-3.4
> +    ./configure --prefix=/usr --qemu-cc=gcc-3.4 
>  
>      for dir in user qemu; do
>        cd ${startdir}/src/kvm-$_kvmver/${dir}
>        make || return 1
>      done
>     # install kvm-qemu
> -    if [ "${CARCH}" = "x86_64" ]; then
>        install -m 755 ${startdir}/src/kvm-$_kvmver/qemu/x86_64-softmmu/qemu-system-x86_64 \
                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Isn't there a difference between i385-softmmu/qemu and
x86_64-softmmu/qemu-system-x86_64?  Do we want to be using the latter on
i686?

> -        ${startdir}/pkg/usr/bin/qemu-system-x86_64-kvm
> -    else 
> -      install -m 755 ${startdir}/src/kvm-$_kvmver/qemu/i386-softmmu/qemu \
>          ${startdir}/pkg/usr/bin/qemu-kvm
> -    fi
>      install -D -m644 ${startdir}/src/kvm-$_kvmver/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.3 extra/emulators/qemu/qemu.install:1.4
> --- extra/emulators/qemu/qemu.install:1.3	Thu Oct  4 13:47:59 2007
> +++ extra/emulators/qemu/qemu.install	Fri Oct  5 05:32:32 2007
> @@ -7,11 +7,7 @@
>    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'."
> -  if [ "$(uname -m)" = "x86_64" ] ; then
> -  	echo ">>>  Use 'qemu-system-x86_64-kvm' to use KVM."
> -  else
> -  	echo ">>>  Use 'qemu-kvm' to use KVM."
> -  fi
> +  echo ">>>  Use 'qemu-kvm' to use KVM."
>    echo""
>    echo ">>> PLEASE READ FOR KQEMU USAGE!"
>    echo ">>> You need to install the 'kqemu' package for your kernel."
> 

> _______________________________________________
> arch-commits mailing list
> arch-commits at archlinux.org
> http://archlinux.org/mailman/listinfo/arch-commits

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.archlinux.org/pipermail/arch-commits/attachments/20071005/313f29a7/attachment.sig>