summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO317
-rw-r--r--65-kvm.rules1
-rw-r--r--PKGBUILD299
-rw-r--r--qemu-guest-agent.install11
-rw-r--r--qemu-guest-agent.service2
-rw-r--r--qemu.install2
6 files changed, 539 insertions, 93 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d8a5f89bc8e5..78bd4de48494 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,52 +1,158 @@
pkgbase = qemu-git
pkgdesc = A generic and open source machine emulator and virtualizer. Git version.
- pkgver = 6.1.0.r1310.g15a0578903
+ pkgver = 6.1.0.r1446.g4d1a525dfa
pkgrel = 1
epoch = 14
- url = http://wiki.qemu.org/
+ url = https://wiki.qemu.org/
arch = i686
arch = x86_64
license = GPL2
license = LGPL2.1
- makedepends = spice-protocol
- makedepends = python
+ makedepends = alsa-lib
+ makedepends = brltty
+ makedepends = bzip2
+ makedepends = cairo
makedepends = ceph
- makedepends = libiscsi
+ makedepends = curl
+ makedepends = cdrtools
+ makedepends = dtc
+ makedepends = fuse3
+ makedepends = gcc-libs
+ makedepends = gdk-pixbuf2
+ makedepends = git
+ makedepends = glib2
makedepends = glusterfs
+ makedepends = gnutls
+ makedepends = gtk3
+ makedepends = jack
+ makedepends = libaio
+ makedepends = libbpf
+ makedepends = libcacard
+ makedepends = libcap-ng
+ makedepends = libepoxy
+ makedepends = libiscsi
+ makedepends = libnfs
+ makedepends = libpng
+ makedepends = libpulse
+ makedepends = libsasl
+ makedepends = libseccomp
+ makedepends = libslirp
+ makedepends = libssh
+ makedepends = liburing
+ makedepends = libusb
+ makedepends = libx11
+ makedepends = libxkbcommon
+ makedepends = lzo
+ makedepends = mesa
+ makedepends = meson
+ makedepends = ncurses
+ makedepends = ndctl
+ makedepends = numactl
+ makedepends = pam
+ makedepends = python
makedepends = python-sphinx
+ makedepends = python-sphinx_rtd_theme
+ makedepends = sdl2
+ makedepends = sdl2_image
+ makedepends = seabios
+ makedepends = snappy
+ makedepends = spice-protocol
+ makedepends = spice
+ makedepends = systemd
+ makedepends = usbredir
+ makedepends = vde2
+ makedepends = virglrenderer
+ makedepends = vte3
makedepends = xfsprogs
- makedepends = git
- makedepends = ninja
+ makedepends = zlib
+ makedepends = zstd
+ source = git://git.qemu.org/qemu.git
+ source = qemu-guest-agent.service
+ source = 65-kvm.rules
+ sha256sums = SKIP
+ sha256sums = c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88
+ sha256sums = a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c
+
+pkgname = qemu-git
+ pkgdesc = QEMU Git version.
+ depends = alsa-lib
+ depends = libasound.so
+ depends = bzip2
+ depends = libbz2.so
+ depends = cairo
+ depends = curl
+ depends = libcurl.so
depends = dtc
- depends = virglrenderer
- depends = sdl2
- depends = vte3
- depends = libpulse
- depends = brltty
- depends = seabios
+ depends = fuse3
+ depends = gcc-libs
+ depends = gdk-pixbuf2
+ depends = libgdk_pixbuf-2.0.so
+ depends = glib2
+ depends = libgio-2.0.so
+ depends = libglib-2.0.so
+ depends = libgmodule-2.0.so
+ depends = libgobject-2.0.so
+ depends = gnutls
+ depends = gtk3
+ depends = libgdk-3.so
+ depends = libgtk-3.so
+ depends = jack
+ depends = libjack.so
depends = libaio
- depends = numactl
- depends = libnfs
- depends = snappy
- depends = curl
- depends = vde2
- depends = spice
+ depends = libbpf
+ depends = libbpf.so
depends = libcacard
- depends = usbredir
+ depends = libcap-ng
+ depends = libcap-ng.so
+ depends = libepoxy
+ depends = libjpeg
+ depends = libjpeg.so
+ depends = libnfs
+ depends = libpng
+ depends = libpulse
+ depends = libpulse.so
+ depends = libsasl
+ depends = libseccomp
+ depends = libseccomp.so
depends = libslirp
+ depends = libslirp.so
depends = libssh
+ depends = libssh.so
+ depends = libusb
+ depends = libusb-1.0.so
depends = liburing
+ depends = liburing.so
+ depends = libx11
+ depends = libxkbcommon
+ depends = libxkbcommon.so
+ depends = lzo
+ depends = mesa
+ depends = ncurses
+ depends = libncursesw.so
depends = ndctl
- depends = dtc
- depends = fuse3
- source = git://git.qemu.org/qemu.git
- source = qemu-guest-agent.service
- source = 65-kvm.rules
- sha256sums = SKIP
- sha256sums = 09a720ed48ef8cf0f67770b67874202600c5209973d10e6e2c72ecc9aea23ece
- sha256sums = 60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7
-
-pkgname = qemu-git
+ depends = numactl
+ depends = libnuma.so
+ depends = pam
+ depends = libpam.so
+ depends = pixman
+ depends = libpixman-1.so
+ depends = seabios
+ depends = sdl2
+ depends = sdl2_image
+ depends = snappy
+ depends = spice
+ depends = libspice-server.so
+ depends = systemd-libs
+ depends = libudev.so
+ depends = usbredir
+ depends = virglrenderer
+ depends = vde2
+ depends = vte3
+ depends = libvte-2.91.so
+ depends = zlib
+ depends = zstd
+ depends = libzstd.so
+ optdepends = brltty: for braille device support
optdepends = qemu-arch-extra-git: extra architectures support
provides = qemu-headless
provides = qemu
@@ -56,56 +162,179 @@ pkgname = qemu-git
pkgname = qemu-headless-git
pkgdesc = QEMU without GUI. Git version.
- depends = seabios
- depends = libaio
- depends = numactl
- depends = libnfs
- depends = snappy
+ depends = bzip2
+ depends = libbz2.so
depends = curl
- depends = vde2
- depends = spice
+ depends = libcurl.so
+ depends = dtc
+ depends = fuse3
+ depends = gcc-libs
+ depends = glib2
+ depends = libgio-2.0.so
+ depends = libglib-2.0.so
+ depends = libgmodule-2.0.so
+ depends = libgobject-2.0.so
+ depends = gnutls
+ depends = libaio
+ depends = libbpf
+ depends = libbpf.so
depends = libcacard
- depends = usbredir
+ depends = libcap-ng
+ depends = libcap-ng.so
+ depends = libjpeg
+ depends = libjpeg.so
+ depends = libnfs
+ depends = libpng
+ depends = libsasl
+ depends = libseccomp
+ depends = libseccomp.so
depends = libslirp
+ depends = libslirp.so
depends = libssh
+ depends = libssh.so
+ depends = libusb
+ depends = libusb-1.0.so
depends = liburing
+ depends = liburing.so
+ depends = libxkbcommon
+ depends = libxkbcommon.so
+ depends = lzo
depends = ndctl
- depends = dtc
- depends = fuse3
+ depends = numactl
+ depends = libnuma.so
+ depends = ncurses
+ depends = libncursesw.so
+ depends = pam
+ depends = libpam.so
+ depends = pixman
+ depends = libpixman-1.so
+ depends = seabios
+ depends = snappy
+ depends = spice
+ depends = libspice-server.so
+ depends = systemd-libs
+ depends = libudev.so
+ depends = usbredir
+ depends = vde2
+ depends = zlib
+ depends = zstd
+ depends = libzstd.so
optdepends = qemu-headless-arch-extra-git: extra architectures support
+ provides = qemu-headless
+ provides = qemu
conflicts = qemu-headless
+ conflicts = qemu
+ replaces = qemu-kvm
pkgname = qemu-arch-extra-git
pkgdesc = QEMU for foreign architectures. Git version.
- depends = qemu
+ depends = dtc
+ depends = fuse3
+ depends = gcc-libs
+ depends = gnutls
+ depends = libaio
+ depends = libbpf
+ depends = libbpf.so
+ depends = glib2
+ depends = libgio-2.0.so
+ depends = libglib-2.0.so
+ depends = libgobject-2.0.so
+ depends = libgmodule-2.0.so
+ depends = libjpeg
+ depends = libjpeg.so
+ depends = libpng
+ depends = libsasl
+ depends = libseccomp
+ depends = libseccomp.so
+ depends = libslirp
+ depends = libslirp.so
+ depends = liburing
+ depends = liburing.so
+ depends = lzo
+ depends = ndctl
+ depends = numactl
+ depends = libnuma.so
+ depends = pam
+ depends = libpam.so
+ depends = pixman
+ depends = libpixman-1.so
+ depends = snappy
+ depends = systemd-libs
+ depends = libudev.so
+ depends = qemu-git
+ depends = vde2
+ depends = zlib
+ depends = zstd
+ depends = libzstd.so
+ optdepends = edk2-armvirt: for aarch64 UEFI support
+ optdepends = edk2-ovmf: for ia32 and x64 UEFI support
provides = qemu-arch-extra
conflicts = qemu-arch-extra
options = !strip
pkgname = qemu-headless-arch-extra-git
pkgdesc = QEMU without GUI, for foreign architectures. Git version.
+ depends = dtc
+ depends = fuse3
+ depends = gcc-libs
+ depends = gnutls
+ depends = libaio
+ depends = libbpf
+ depends = libbpf.so
+ depends = glib2
+ depends = libgio-2.0.so
+ depends = libglib-2.0.so
+ depends = libgobject-2.0.so
+ depends = libgmodule-2.0.so
+ depends = libjpeg
+ depends = libjpeg.so
+ depends = libpng
+ depends = libsasl
+ depends = libseccomp
+ depends = libseccomp.so
+ depends = libslirp
+ depends = libslirp.so
+ depends = liburing
+ depends = liburing.so
+ depends = lzo
+ depends = ndctl
+ depends = numactl
+ depends = libnuma.so
+ depends = pam
+ depends = libpam.so
+ depends = pixman
+ depends = libpixman-1.so
+ depends = snappy
depends = qemu-headless-git
+ depends = systemd-libs
+ depends = libudev.so
+ depends = vde2
+ depends = zlib
+ depends = zstd
+ depends = libzstd.so
+ optdepends = edk2-armvirt: for aarch64 UEFI support
+ optdepends = edk2-ovmf: for ia32 and x64 UEFI support
provides = qemu-headless-arch-extra
conflicts = qemu-headless-arch-extra
options = !strip
pkgname = qemu-block-iscsi-git
pkgdesc = QEMU iSCSI block module. Git version.
- depends = glib2
+ depends = glibc
depends = libiscsi
provides = qemu-block-iscsi
conflicts = qemu-block-iscsi
pkgname = qemu-block-rbd-git
pkgdesc = QEMU RBD block module. Git version.
- depends = glib2
+ depends = glibc
depends = ceph-libs
provides = qemu-block-rbd
conflicts = qemu-block-rbd
pkgname = qemu-block-gluster-git
pkgdesc = QEMU GlusterFS block module. Git version.
- depends = glib2
+ depends = glibc
depends = glusterfs
provides = qemu-block-gluster
conflicts = qemu-block-gluster
diff --git a/65-kvm.rules b/65-kvm.rules
index 569ded9f972f..fbb0ebb69c9e 100644
--- a/65-kvm.rules
+++ b/65-kvm.rules
@@ -1,2 +1 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
diff --git a/PKGBUILD b/PKGBUILD
index cce7eaa7c697..b5999f77294c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,94 @@
# Contributor: ajs124 < aur at ajs124 dot de>
# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: David Runge <dvzrv@archlinux.org>
# Contributor: Sébastien "Seblu" Luttringer <seblu@seblu.net>
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)
+pkgname=(
+ qemu-git
+ qemu-headless-git
+ qemu-arch-extra-git
+ qemu-headless-arch-extra-git
+ qemu-block-{iscsi,rbd,gluster}-git
+ qemu-guest-agent-git
+)
pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
-pkgver=6.1.0.r1310.g15a0578903
+pkgver=6.1.0.r1446.g4d1a525dfa
pkgrel=1
epoch=14
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
-url="http://wiki.qemu.org/"
-_headlessdeps=(seabios libaio numactl libnfs
- snappy curl vde2 spice libcacard usbredir libslirp
- libssh liburing ndctl dtc fuse3)
-depends=(dtc virglrenderer sdl2 vte3 libpulse brltty "${_headlessdeps[@]}")
-makedepends=(spice-protocol python ceph libiscsi glusterfs python-sphinx xfsprogs git ninja)
+url="https://wiki.qemu.org/"
+# TODO: consider providing rdma-core
+# TODO: consider providing lzfse
+makedepends=(
+ alsa-lib
+ brltty
+ bzip2
+ cairo
+ ceph
+ curl
+ cdrtools
+ dtc
+ fuse3
+ gcc-libs
+ gdk-pixbuf2
+ git
+ glib2
+ glusterfs
+ gnutls
+ gtk3
+ jack
+ libaio
+ libbpf
+ libcacard
+ libcap-ng
+ libepoxy
+ libiscsi
+ libnfs
+ libpng
+ libpulse
+ libsasl
+ libseccomp
+ libslirp
+ libssh
+ liburing
+ libusb
+ libx11
+ libxkbcommon
+ lzo
+ mesa
+ meson
+ ncurses
+ ndctl
+ numactl
+ pam
+ python
+ python-sphinx
+ python-sphinx_rtd_theme
+ sdl2
+ sdl2_image
+ seabios
+ snappy
+ spice-protocol
+ spice
+ systemd
+ usbredir
+ vde2
+ virglrenderer
+ vte3
+ xfsprogs
+ zlib
+ zstd
+)
source=(git://git.qemu.org/qemu.git
qemu-guest-agent.service
65-kvm.rules)
sha256sums=('SKIP'
- '09a720ed48ef8cf0f67770b67874202600c5209973d10e6e2c72ecc9aea23ece'
- '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7')
+ 'c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88'
+ 'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c')
case $CARCH in
i?86) _corearch=i386 ;;
@@ -33,7 +98,7 @@ esac
pkgver() {
cd "${srcdir}/${_gitname}"
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -c2-47
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -c2-47
}
prepare() {
@@ -44,7 +109,7 @@ prepare() {
build() {
_build full \
- --audio-drv-list="pa alsa sdl"
+ --audio-drv-list="pa,alsa,sdl,jack"
_build headless \
--audio-drv-list= \
@@ -58,7 +123,7 @@ build() {
_build() (
cd ${srcdir}/${_gitname}/build-$1
-
+
../configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -77,7 +142,61 @@ _build() (
)
package_qemu-git() {
- optdepends=('qemu-arch-extra-git: extra architectures support')
+ pkgdesc="QEMU Git version."
+ depends=(
+ alsa-lib libasound.so
+ bzip2 libbz2.so
+ cairo
+ curl libcurl.so
+ dtc
+ fuse3
+ gcc-libs
+ gdk-pixbuf2 libgdk_pixbuf-2.0.so
+ glib2 libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
+ gnutls
+ gtk3 libgdk-3.so libgtk-3.so
+ jack libjack.so
+ libaio
+ libbpf libbpf.so
+ libcacard
+ libcap-ng libcap-ng.so
+ libepoxy
+ libjpeg libjpeg.so
+ libnfs
+ libpng
+ libpulse libpulse.so
+ libsasl
+ libseccomp libseccomp.so
+ libslirp libslirp.so
+ libssh libssh.so
+ libusb libusb-1.0.so
+ liburing liburing.so
+ libx11
+ libxkbcommon libxkbcommon.so
+ lzo
+ mesa
+ ncurses libncursesw.so
+ ndctl
+ numactl libnuma.so
+ pam libpam.so
+ pixman libpixman-1.so
+ seabios
+ sdl2
+ sdl2_image
+ snappy
+ spice libspice-server.so
+ systemd-libs libudev.so
+ usbredir
+ virglrenderer
+ vde2
+ vte3 libvte-2.91.so
+ zlib
+ zstd libzstd.so
+ )
+ optdepends=(
+ 'brltty: for braille device support'
+ 'qemu-arch-extra-git: extra architectures support'
+ )
conflicts=('qemu-headless' 'qemu')
provides=('qemu-headless' 'qemu')
replaces=(qemu-kvm)
@@ -87,9 +206,47 @@ package_qemu-git() {
package_qemu-headless-git() {
pkgdesc="QEMU without GUI. Git version."
- depends=("${_headlessdeps[@]}")
+ depends=(
+ bzip2 libbz2.so
+ curl libcurl.so
+ dtc
+ fuse3
+ gcc-libs
+ glib2 libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
+ gnutls
+ libaio
+ libbpf libbpf.so
+ libcacard
+ libcap-ng libcap-ng.so
+ libjpeg libjpeg.so
+ libnfs
+ libpng
+ libsasl
+ libseccomp libseccomp.so
+ libslirp libslirp.so
+ libssh libssh.so
+ libusb libusb-1.0.so
+ liburing liburing.so
+ libxkbcommon libxkbcommon.so
+ lzo
+ ndctl
+ numactl libnuma.so
+ ncurses libncursesw.so
+ pam libpam.so
+ pixman libpixman-1.so
+ seabios
+ snappy
+ spice libspice-server.so
+ systemd-libs libudev.so
+ usbredir
+ vde2
+ zlib
+ zstd libzstd.so
+ )
optdepends=('qemu-headless-arch-extra-git: extra architectures support')
- conflicts=('qemu-headless')
+ conflicts=('qemu-headless' 'qemu')
+ provides=('qemu-headless' 'qemu')
+ replaces=(qemu-kvm)
_package headless
}
@@ -103,11 +260,11 @@ _package() {
install=qemu.install
options=(!strip !emptydirs)
- DESTDIR="$pkgdir" ninja -C ${srcdir}/${_gitname}/build-$1 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"
-
+
# remove conflicting /var/run directory
cd "$pkgdir"
rm -r var
@@ -122,7 +279,6 @@ _package() {
rm qemu/block-{iscsi,rbd,gluster}.so
cd ../bin
- tidy_strip
# remove extra arch
for _bin in qemu-*; do
@@ -146,7 +302,7 @@ _package() {
for _blob in *; do
[[ -f $_blob ]] || continue
- case $_blob in
+ case $_blob in
# provided by seabios package
bios.bin|bios-256k.bin|vgabios-cirrus.bin|vgabios-qxl.bin|\
vgabios-stdvga.bin|vgabios-vmware.bin|vgabios-virtio.bin|vgabios-bochs-display.bin|\
@@ -154,7 +310,7 @@ _package() {
# provided by edk2-ovmf package
edk2-*) rm "$_blob"; continue ;;
-
+
# iPXE ROMs
efi-*|pxe-*) continue ;;
@@ -163,64 +319,123 @@ _package() {
# Trace events definitions
trace-events*) continue ;;
-
- esac
+ esac
mv "$_blob" "$srcdir/$_gitname/extra-arch-$1/usr/share/qemu"
done
- # provided by edk2-ovmf package
- rm -r firmware
-
- cd ..
- if [ "$1" = headless ]; then rm -r {applications,icons}; fi
+ # provided by edk2-ovmf package
+ rm -r firmware
+
+ cd ..
+ if [ "$1" = headless ]; then rm -r {applications,icons}; fi
}
package_qemu-arch-extra-git() {
pkgdesc="QEMU for foreign architectures. Git version."
- depends=(qemu)
+ depends=(
+ dtc
+ fuse3
+ gcc-libs
+ gnutls
+ libaio
+ libbpf libbpf.so
+ glib2 libgio-2.0.so libglib-2.0.so libgobject-2.0.so libgmodule-2.0.so
+ libjpeg libjpeg.so
+ libpng
+ libsasl
+ libseccomp libseccomp.so
+ libslirp libslirp.so
+ liburing liburing.so
+ lzo
+ ndctl
+ numactl libnuma.so
+ pam libpam.so
+ pixman libpixman-1.so
+ snappy
+ systemd-libs
+ libudev.so
+ qemu-git
+ vde2
+ zlib
+ zstd
+ libzstd.so
+ )
+ optdepends=(
+ 'edk2-armvirt: for aarch64 UEFI support'
+ 'edk2-ovmf: for ia32 and x64 UEFI support'
+ )
+ options=(!strip)
provides=(qemu-arch-extra)
conflicts=(qemu-arch-extra)
- options=(!strip)
- mv $srcdir/$_gitname/extra-arch-full/usr "$pkgdir"
+ mv -v "$srcdir/$_gitname/extra-arch-full/usr" "$pkgdir"
}
package_qemu-headless-arch-extra-git() {
pkgdesc="QEMU without GUI, for foreign architectures. Git version."
- depends=(qemu-headless-git)
+ depends=(
+ dtc
+ fuse3
+ gcc-libs
+ gnutls
+ libaio
+ libbpf libbpf.so
+ glib2 libgio-2.0.so libglib-2.0.so libgobject-2.0.so libgmodule-2.0.so
+ libjpeg libjpeg.so
+ libpng
+ libsasl
+ libseccomp libseccomp.so
+ libslirp libslirp.so
+ liburing liburing.so
+ lzo
+ ndctl
+ numactl libnuma.so
+ pam libpam.so
+ pixman libpixman-1.so
+ snappy
+ qemu-headless-git
+ systemd-libs libudev.so
+ vde2
+ zlib
+ zstd libzstd.so
+ )
+ optdepends=(
+ 'edk2-armvirt: for aarch64 UEFI support'
+ 'edk2-ovmf: for ia32 and x64 UEFI support'
+ )
options=(!strip)
conflicts=(qemu-headless-arch-extra)
provides=(qemu-headless-arch-extra)
- mv $srcdir/$_gitname/extra-arch-headless/usr "$pkgdir"
+ mv -v "$srcdir/$_gitname/extra-arch-headless/usr" "$pkgdir"
}
package_qemu-block-iscsi-git() {
pkgdesc="QEMU iSCSI block module. Git version."
- depends=(glib2 libiscsi)
+ depends=(glibc libiscsi)
conflicts=(qemu-block-iscsi)
provides=(qemu-block-iscsi)
- install -D $srcdir/$_gitname/build-full/block-iscsi.so "$pkgdir/usr/lib/qemu/block-iscsi.so"
+ install -vDm 755 "$srcdir/$_gitname/build-full/block-iscsi.so" -t "$pkgdir/usr/lib/qemu/"
}
package_qemu-block-rbd-git() {
pkgdesc="QEMU RBD block module. Git version."
- depends=(glib2 ceph-libs)
+ depends=(glibc ceph-libs)
conflicts=(qemu-block-rbd)
provides=(qemu-block-rbd)
- install -D $srcdir/$_gitname/build-full/block-rbd.so "$pkgdir/usr/lib/qemu/block-rbd.so"
+ install -vDm 755 "$srcdir/$_gitname/build-full/block-rbd.so" -t "$pkgdir/usr/lib/qemu/"
}
package_qemu-block-gluster-git() {
pkgdesc="QEMU GlusterFS block module. Git version."
- depends=(glib2 glusterfs)
+ depends=(glibc glusterfs)
conflicts=(qemu-block-gluster)
provides=(qemu-block-gluster)
- install -D $srcdir/$_gitname/build-full/block-gluster.so "$pkgdir/usr/lib/qemu/block-gluster.so"
+ install -vDm 755 "$srcdir/$_gitname/build-full/block-gluster.so" -t "$pkgdir/usr/lib/qemu/"
}
package_qemu-guest-agent-git() {
@@ -230,9 +445,9 @@ package_qemu-guest-agent-git() {
provides=(qemu-guest-agent)
install=qemu-guest-agent.install
- 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"
+ install -vDm 755 "$srcdir/$_gitname/build-full/qga/qemu-ga" -t "$pkgdir/usr/bin/"
+ install -vDm 644 "$srcdir/qemu-guest-agent.service" -t "$pkgdir/usr/lib/systemd/system/"
+ install -vDm 755 "$srcdir/$_gitname/scripts/qemu-guest-agent/fsfreeze-hook" -t "$pkgdir/etc/qemu/"
}
# vim:set ts=2 sw=2 et:
diff --git a/qemu-guest-agent.install b/qemu-guest-agent.install
index 0928e0bb8498..9f7fd8f85ac0 100644
--- a/qemu-guest-agent.install
+++ b/qemu-guest-agent.install
@@ -1,6 +1,9 @@
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"
+ if (( $(vercmp "$2" '5.1.0-2') < 0 )); then
+ printf "NOTE: The qemu-ga.service has been renamed to qemu-guest-agent.service\n"
+ fi
+ if systemctl is-enabled -q qemu-ga.service; then
+ systemctl disable qemu-ga.service
+ systemctl enable qemu-guest-agent.service
+ fi
}
diff --git a/qemu-guest-agent.service b/qemu-guest-agent.service
index fe227c0abe8f..abbb6ab9dfe2 100644
--- a/qemu-guest-agent.service
+++ b/qemu-guest-agent.service
@@ -3,7 +3,7 @@ Description=QEMU Guest Agent
ConditionPathExists=/dev/virtio-ports/org.qemu.guest_agent.0
[Service]
-ExecStart=/usr/bin/qga
+ExecStart=/usr/bin/qemu-ga
[Install]
WantedBy=multi-user.target
diff --git a/qemu.install b/qemu.install
index 9fe850d4ed7e..d90269ecfecd 100644
--- a/qemu.install
+++ b/qemu.install
@@ -1,7 +1,7 @@
# Arg 1: the new package version
post_install() {
# trigger events on modules files when already loaded
- for _f in /sys/devices/virtual/misc/{kvm,vhost-net}; do
+ for _f in /sys/devices/virtual/misc/vhost-net; do
[[ -e "$_f" ]] && udevadm trigger "$_f"
done
: