diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | PKGBUILD | 27 | ||||
| -rw-r--r-- | qemu-guest-agent.install | 6 | ||||
| -rw-r--r-- | qemu-guest-agent.service (renamed from qemu-ga.service) | 3 |
4 files changed, 35 insertions, 20 deletions
@@ -1,8 +1,8 @@ pkgbase = qemu-git pkgdesc = A generic and open source machine emulator and virtualizer. Git version. - pkgver = 5.1.0.r4.g1d806cef0e - pkgrel = 2 - epoch = 11 + pkgver = 5.2.0.r136.g379e9eaed4 + pkgrel = 1 + epoch = 12 url = http://wiki.qemu.org/ arch = i686 arch = x86_64 @@ -15,6 +15,8 @@ pkgbase = qemu-git makedepends = glusterfs makedepends = python-sphinx makedepends = xfsprogs + makedepends = git + makedepends = ninja depends = dtc depends = virglrenderer depends = sdl2 @@ -39,11 +41,13 @@ pkgbase = qemu-git depends = libssh depends = zstd depends = liburing - source = git://git.qemu.org/qemu.git#commit=d0ed6a69d399ae193959225cdeaa9382746c91cc - source = qemu-ga.service + depends = ndctl + depends = dtc + source = git://git.qemu.org/qemu.git + source = qemu-guest-agent.service source = 65-kvm.rules sha256sums = SKIP - sha256sums = 0b4f3283973bb3bc876735f051d8eaab68f0065502a3a5012141fad193538ea1 + sha256sums = 09a720ed48ef8cf0f67770b67874202600c5209973d10e6e2c72ecc9aea23ece sha256sums = 60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7 pkgname = qemu-git @@ -74,6 +78,8 @@ pkgname = qemu-headless-git depends = libssh depends = zstd depends = liburing + depends = ndctl + depends = dtc optdepends = qemu-headless-arch-extra-git: extra architectures support conflicts = qemu-headless @@ -114,6 +120,7 @@ pkgname = qemu-block-gluster-git pkgname = qemu-guest-agent-git pkgdesc = QEMU Guest Agent. Git version. + install = qemu-guest-agent.install depends = gcc-libs depends = glib2 depends = libudev.so @@ -8,23 +8,23 @@ 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=5.1.0.r4.g1d806cef0e -pkgrel=2 -epoch=11 +pkgver=5.2.0.r136.g379e9eaed4 +pkgrel=1 +epoch=12 arch=(i686 x86_64) license=(GPL2 LGPL2.1) url="http://wiki.qemu.org/" _headlessdeps=(seabios gnutls libpng libaio numactl libnfs lzo snappy curl vde2 libcap-ng spice libcacard usbredir libslirp - libssh zstd liburing) + libssh zstd liburing ndctl dtc) depends=(dtc virglrenderer sdl2 vte3 libpulse brltty "${_headlessdeps[@]}") -makedepends=(spice-protocol python ceph libiscsi glusterfs python-sphinx xfsprogs) -source=("git://git.qemu.org/qemu.git#commit=d0ed6a69d399ae193959225cdeaa9382746c91cc" - qemu-ga.service +makedepends=(spice-protocol python ceph libiscsi glusterfs python-sphinx xfsprogs git ninja) +source=(git://git.qemu.org/qemu.git + qemu-guest-agent.service 65-kvm.rules) sha256sums=('SKIP' - '0b4f3283973bb3bc876735f051d8eaab68f0065502a3a5012141fad193538ea1' - '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7') + '09a720ed48ef8cf0f67770b67874202600c5209973d10e6e2c72ecc9aea23ece' + '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7') case $CARCH in i?86) _corearch=i386 ;; @@ -75,7 +75,7 @@ _build() ( --enable-xfsctl \ "${@:2}" - make + ninja ) package_qemu-git() { @@ -105,7 +105,7 @@ _package() { install=qemu.install options=(!strip !emptydirs) - make -C ${srcdir}/${_gitname}/build-$1 DESTDIR="$pkgdir" install "${@:2}" + DESTDIR="$pkgdir" ninja -C ${srcdir}/${_gitname}/build-$1 install "${@:2}" # systemd stuff install -Dm644 65-kvm.rules "$pkgdir/usr/lib/udev/rules.d/65-kvm.rules" @@ -230,9 +230,10 @@ package_qemu-guest-agent-git() { depends=(gcc-libs glib2 libudev.so) conflicts=(qemu-guest-agent) provides=(qemu-guest-agent) + install=qemu-guest-agent.install - install -D $srcdir/$_gitname/build-full/qemu-ga "$pkgdir/usr/bin/qemu-ga" - install -Dm644 $srcdir/qemu-ga.service "$pkgdir/usr/lib/systemd/system/qemu-ga.service" + install -D $srcdir/$_gitname/build-full/qga/qemu-ga "$pkgdir/usr/bin/qga" + install -Dm644 $srcdir/qemu-guest-agent.service "$pkgdir/usr/lib/systemd/system/qemu-guest-agent.service" install -Dm755 "$srcdir/$_gitname/scripts/qemu-guest-agent/fsfreeze-hook" "$pkgdir/etc/qemu/fsfreeze-hook" } diff --git a/qemu-guest-agent.install b/qemu-guest-agent.install new file mode 100644 index 000000000000..0928e0bb8498 --- /dev/null +++ b/qemu-guest-agent.install @@ -0,0 +1,6 @@ +post_upgrade() { + echo "qemu-ga.service was renamed to qemu-guest-agent.service" + echo "You might want to switch to the new service name:" + echo "# systemctl disable qemu-ga.service" + echo "# systemctl enable qemu-guest-agent.service" +} diff --git a/qemu-ga.service b/qemu-guest-agent.service index e5eb469f9d49..fe227c0abe8f 100644 --- a/qemu-ga.service +++ b/qemu-guest-agent.service @@ -1,8 +1,9 @@ [Unit] Description=QEMU Guest Agent +ConditionPathExists=/dev/virtio-ports/org.qemu.guest_agent.0 [Service] -ExecStart=/usr/bin/qemu-ga +ExecStart=/usr/bin/qga [Install] WantedBy=multi-user.target |