diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-06 11:43:14 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-06 11:43:14 +0200 |
| commit | 601a559448eb957ac98aca7a6e03de59e45fff91 (patch) | |
| tree | 13fc71216622c3d764aa611b6a54e1918f21c496 /extra/qemu | |
| parent | c96a7351e1f295c1e311860dec19ac7b506b0c5c (diff) | |
| parent | f37e773fe397778858ea8d51601554863c252536 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/rtorrent/PKGBUILD
core/libcap/PKGBUILD
extra/samba/PKGBUILD
extra/systemd/PKGBUILD
extra/usbmuxd/PKGBUILD
testing/glib2/PKGBUILD
Diffstat (limited to 'extra/qemu')
| -rw-r--r-- | extra/qemu/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/qemu/qemu.install | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 6a0ab52a9..f5e145be5 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 152196 2012-03-05 08:20:34Z tpowa $ +# $Id: PKGBUILD 158630 2012-05-05 03:24:55Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse') backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz @@ -42,7 +42,7 @@ package() { cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin" install -D -m644 "${srcdir}/65-kvm.rules" \ - "${pkgdir}/lib/udev/rules.d/65-kvm.rules" + "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" # strip scripts directory find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in diff --git a/extra/qemu/qemu.install b/extra/qemu/qemu.install index e16ac027c..fd92c60eb 100644 --- a/extra/qemu/qemu.install +++ b/extra/qemu/qemu.install @@ -5,7 +5,6 @@ post_install() { 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 "" if [ "$(vercmp $2 0.11)" -lt 0 ]; then echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" |