summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2020-05-02 13:11:46 +0200
committerFrederic Bezies2020-05-02 13:11:46 +0200
commitc2d46efc0c7d1f1710d2e22a59b897810c2e82d1 (patch)
tree1e39b87472e6e79a7431ebb5b41a3350f283b5fc
parent9253b5b4861b8c319dae2651ae4cc6c9081f379c (diff)
downloadaur-c2d46efc0c7d1f1710d2e22a59b897810c2e82d1.tar.gz
cleaned up PKGBUILD and sync with qemu 5.0 official PKGBUILD
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD21
2 files changed, 20 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fb4f79c46a5..412886bf640 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qemu-git
pkgdesc = A generic and open source machine emulator and virtualizer. Git version.
- pkgver = v5.0.0.r34.g648db19685
+ pkgver = v5.0.0.r145.g1c47613588
pkgrel = 1
epoch = 10
url = http://wiki.qemu.org/
@@ -13,8 +13,8 @@ pkgbase = qemu-git
makedepends = ceph
makedepends = libiscsi
makedepends = glusterfs
- makedepends = git
makedepends = python-sphinx
+ makedepends = xfsprogs
depends = dtc
depends = virglrenderer
depends = sdl2
@@ -27,7 +27,6 @@ pkgbase = qemu-git
depends = libaio
depends = numactl
depends = jemalloc
- depends = xfsprogs
depends = libnfs
depends = lzo
depends = snappy
@@ -39,6 +38,8 @@ pkgbase = qemu-git
depends = usbredir
depends = libslirp
depends = libssh
+ depends = zstd
+ depends = liburing
source = git://git.qemu.org/qemu.git
source = qemu-ga.service
source = 65-kvm.rules
@@ -50,13 +51,8 @@ pkgname = qemu-git
optdepends = qemu-arch-extra-git: extra architectures support
provides = qemu-headless
provides = qemu
- provides = qemu-kvm
- provides = qemu-spice
conflicts = qemu-headless
conflicts = qemu
- conflicts = kvm
- conflicts = kvm-git
- conflicts = qemu-spice
replaces = qemu-kvm
pkgname = qemu-headless-git
@@ -67,7 +63,6 @@ pkgname = qemu-headless-git
depends = libaio
depends = numactl
depends = jemalloc
- depends = xfsprogs
depends = libnfs
depends = lzo
depends = snappy
@@ -79,6 +74,8 @@ pkgname = qemu-headless-git
depends = usbredir
depends = libslirp
depends = libssh
+ depends = zstd
+ depends = liburing
optdepends = qemu-headless-arch-extra-git: extra architectures support
conflicts = qemu-headless
@@ -107,7 +104,7 @@ pkgname = qemu-block-iscsi-git
pkgname = qemu-block-rbd-git
pkgdesc = QEMU RBD block module. Git version.
depends = glib2
- depends = ceph
+ depends = ceph-libs
provides = qemu-block-rbd
conflicts = qemu-block-rbd
@@ -122,6 +119,7 @@ pkgname = qemu-guest-agent-git
pkgdesc = QEMU Guest Agent. Git version.
depends = gcc-libs
depends = glib2
+ depends = libudev.so
provides = qemu-guest-agent
conflicts = qemu-guest-agent
diff --git a/PKGBUILD b/PKGBUILD
index cdbde842410..666d8466603 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,17 +8,17 @@ pkgbase=qemu-git
_gitname=qemu
pkgname=(qemu-git qemu-headless-git qemu-arch-extra-git qemu-headless-arch-extra-git qemu-block-{iscsi-git,rbd-git,gluster-git} qemu-guest-agent-git)
pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
-pkgver=v5.0.0.r34.g648db19685
+pkgver=v5.0.0.r145.g1c47613588
pkgrel=1
epoch=10
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
url="http://wiki.qemu.org/"
-_headlessdeps=(seabios gnutls libpng libaio numactl jemalloc xfsprogs libnfs
+_headlessdeps=(seabios gnutls libpng libaio numactl jemalloc libnfs
lzo snappy curl vde2 libcap-ng spice libcacard usbredir libslirp
- libssh)
+ libssh zstd liburing)
depends=(dtc virglrenderer sdl2 vte3 libpulse brltty "${_headlessdeps[@]}")
-makedepends=(spice-protocol python ceph libiscsi glusterfs git python-sphinx)
+makedepends=(spice-protocol python ceph libiscsi glusterfs python-sphinx xfsprogs)
source=(git://git.qemu.org/qemu.git
qemu-ga.service
65-kvm.rules)
@@ -73,12 +73,14 @@ _build() (
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/qemu \
+ --extra-ldflags="$LDFLAGS" \
--smbd=/usr/bin/smbd \
--enable-modules \
--enable-sdl \
--enable-jemalloc \
--disable-werror \
--enable-slirp=system \
+ --enable-xfsctl \
"${@:2}"
make
@@ -86,8 +88,8 @@ _build() (
package_qemu-git() {
optdepends=('qemu-arch-extra-git: extra architectures support')
- conflicts=('qemu-headless' 'qemu' 'kvm' 'kvm-git' 'qemu-spice')
- provides=('qemu-headless' 'qemu' 'qemu-kvm' 'qemu-spice')
+ conflicts=('qemu-headless' 'qemu')
+ provides=('qemu-headless' 'qemu')
replaces=(qemu-kvm)
_package full
@@ -158,7 +160,8 @@ _package() {
case $_blob in
# provided by seabios package
bios.bin|acpi-dsdt.aml|bios-256k.bin|vgabios-cirrus.bin|vgabios-qxl.bin|\
- vgabios-stdvga.bin|vgabios-bochs-display.bin|vgabios-ramfb.bin|vgabios-vmware.bin|vgabios-virtio.bin) rm "$_blob"; continue ;;
+ vgabios-stdvga.bin|vgabios-vmware.bin|vgabios-virtio.bin|vgabios-bochs-display.bin|\
+ vgabios-ramfb.bin) rm "$_blob"; continue ;;
# iPXE ROMs
@@ -209,7 +212,7 @@ package_qemu-block-iscsi-git() {
package_qemu-block-rbd-git() {
pkgdesc="QEMU RBD block module. Git version."
- depends=(glib2 ceph)
+ depends=(glib2 ceph-libs)
conflicts=(qemu-block-rbd)
provides=(qemu-block-rbd)
@@ -227,7 +230,7 @@ package_qemu-block-gluster-git() {
package_qemu-guest-agent-git() {
pkgdesc="QEMU Guest Agent. Git version."
- depends=(gcc-libs glib2)
+ depends=(gcc-libs glib2 libudev.so)
conflicts=(qemu-guest-agent)
provides=(qemu-guest-agent)