[arch-commits] Commit in qemu/trunk (PKGBUILD qemu.install)
Jan Steffens
heftig at archlinux.org
Thu May 12 23:09:16 UTC 2016
Date: Friday, May 13, 2016 @ 01:09:16
Author: heftig
Revision: 267915
2.6.0-1
Modified:
qemu/trunk/PKGBUILD
qemu/trunk/qemu.install
--------------+
PKGBUILD | 42 ++++++++++++++++++++----------------------
qemu.install | 15 ---------------
2 files changed, 20 insertions(+), 37 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-05-12 23:05:29 UTC (rev 267914)
+++ PKGBUILD 2016-05-12 23:09:16 UTC (rev 267915)
@@ -9,21 +9,24 @@
'qemu-block-rbd'
'qemu-block-gluster'
'qemu-guest-agent')
-pkgver=2.5.1
+pkgdesc='A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation'
+pkgver=2.6.0
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
url='http://wiki.qemu.org/'
-makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
- 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
- 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
- 'usbredir' 'ceph' 'glusterfs' 'libssh2' 'lzo' 'snappy')
+depends=('pixman' 'libjpeg' 'libpng' 'sdl2' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'libsasl' 'libgl'
+ 'seabios' 'libcap' 'libcap-ng' 'libaio' 'libseccomp' 'libcacard'
+ 'spice' 'usbredir' 'lzo' 'snappy' 'gcc-libs' 'zlib' 'bzip2' 'nspr'
+ 'ncurses' 'libx11' 'libusb' 'libpulse' 'libssh2' 'curl' 'vte3'
+ 'virglrenderer' 'jemalloc')
+makedepends=('curl' 'libiscsi' 'spice-protocol' 'python2' 'ceph' 'glusterfs')
source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
qemu.sysusers
qemu-ga.service
65-kvm.rules)
-md5sums=('42e73182dea8b9213fa7050e168a4615'
+md5sums=('ca3f70b43f093e33e9e014f144067f13'
'49778d11c28af170c4bebcc648b0ace1'
'44ee242d758f9318c6a1ea1dae96aa3a'
'33ab286a20242dda7743a900f369d68a')
@@ -33,7 +36,7 @@
sh4 sh4eb sparc sparc32plus sparc64 moxie ppcemb tricore unicore32 xtensa xtensaeb)
_extra_blob=(QEMU,cgthree.bin QEMU,tcx.bin bamboo.dtb openbios-ppc
openbios-sparc32 openbios-sparc64 palcode-clipper petalogix-ml605.dtb
-petalogix-s3adsp1800.dtb ppc_rom.bin s390-ccw.img s390-zipl.rom slof.bin
+petalogix-s3adsp1800.dtb ppc_rom.bin s390-ccw.img slof.bin
spapr-rtas.bin u-boot.e500)
prepare() {
@@ -42,6 +45,7 @@
msg2 "Patching $_p"
patch -p1 -d ${pkgname}-${pkgver} < "$_p"
done
+ sed -i 's/vte-2\.90/vte-2.91/g' ${pkgname}-${pkgver}/configure
}
build ()
@@ -55,20 +59,15 @@
./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
--python=/usr/bin/python2 --smbd=/usr/bin/smbd \
--enable-docs --libexecdir=/usr/lib/qemu \
- --disable-gtk --enable-linux-aio --enable-seccomp \
+ --enable-gtk --enable-linux-aio --enable-seccomp \
--enable-spice --localstatedir=/var \
- --enable-tpm \
+ --with-gtkabi=3.0 --with-sdlabi=2.0 --enable-vte \
+ --enable-tpm --enable-jemalloc --enable-opengl \
--enable-modules --enable-{rbd,glusterfs,libiscsi,curl}
make V=99
}
package_qemu() {
- pkgdesc='A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation'
- depends=('glibc' 'pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
- 'gnutls' 'bluez-libs' 'vde2' 'util-linux' 'libsasl' 'libgl'
- 'seabios' 'libcap' 'libcap-ng' 'libaio' 'libseccomp' 'libcacard'
- 'spice' 'usbredir' 'lzo' 'snappy' 'gcc-libs' 'zlib' 'bzip2' 'nspr'
- 'ncurses' 'libx11' 'libusb' 'libpulse' 'libssh2' 'curl')
replaces=('qemu-kvm')
optdepends=('samba: SMB/CIFS server support'
'qemu-arch-extra: extra architectures support'
@@ -85,7 +84,6 @@
# provided by seabios package
rm usr/share/qemu/bios.bin
rm usr/share/qemu/acpi-dsdt.aml
- rm usr/share/qemu/q35-acpi-dsdt.aml
rm usr/share/qemu/bios-256k.bin
rm usr/share/qemu/vgabios-cirrus.bin
rm usr/share/qemu/vgabios-qxl.bin
@@ -120,7 +118,7 @@
package_qemu-arch-extra() {
pkgdesc='QEMU with full support for non x86 architectures'
- depends=('glibc' 'gcc-libs' 'glib2' 'qemu')
+ depends=('qemu')
options=(!strip)
cd qemu-${pkgver}
@@ -140,7 +138,7 @@
package_qemu-block-iscsi() {
pkgdesc='QEMU iSCSI block module'
- depends=('glibc' 'glib2' 'libiscsi')
+ depends=('glib2' 'libiscsi' 'jemalloc')
install -D qemu-${pkgver}/block-iscsi.so "${pkgdir}"/usr/lib/qemu/block-iscsi.so
}
@@ -147,7 +145,7 @@
package_qemu-block-rbd() {
pkgdesc='QEMU RBD block module'
- depends=('glibc' 'glib2' 'ceph')
+ depends=('glib2' 'ceph')
install -D qemu-${pkgver}/block-rbd.so "${pkgdir}"/usr/lib/qemu/block-rbd.so
}
@@ -154,7 +152,7 @@
package_qemu-block-gluster() {
pkgdesc='QEMU GlusterFS block module'
- depends=('glibc' 'glib2' 'glusterfs')
+ depends=('glib2' 'glusterfs')
install -D qemu-${pkgver}/block-gluster.so "${pkgdir}"/usr/lib/qemu/block-gluster.so
}
@@ -161,7 +159,7 @@
package_qemu-guest-agent() {
pkgdesc='QEMU Guest Agent'
- depends=('glibc' 'gcc-libs' 'glib2')
+ depends=('gcc-libs' 'glib2')
install -D qemu-${pkgver}/qemu-ga "${pkgdir}"/usr/bin/qemu-ga
install -Dm644 qemu-ga.service "${pkgdir}"/usr/lib/systemd/system/qemu-ga.service
Modified: qemu.install
===================================================================
--- qemu.install 2016-05-12 23:05:29 UTC (rev 267914)
+++ qemu.install 2016-05-12 23:09:16 UTC (rev 267915)
@@ -9,18 +9,3 @@
done
:
}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if (( "$(vercmp $2 0.11)" < 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
- if (( "$(vercmp $2 1.3.1)" < 0 )); then
- echo "With the release of qemu 1.3.0, qemu-kvm binary is removed."
- echo "You need to change the emulator path, if you use libvirt by using:"
- echo "'virsh edit <vm-name>'"
- fi
-}
More information about the arch-commits
mailing list