moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

libvirt: update to 6.9.0.

Browse source
This commit is contained in:
Andrew J. Hesford 2020-10-18 09:55:10 -04:00
parent ddf2e5fd82
commit ca2aab15b8
2 changed files with 31 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

27
srcpkgs/libvirt/patches/fix-virFileSetCOW.patch
View file

@ -1,27 +0,0 @@
https://www.redhat.com/archives/libvir-list/2020-August/msg00259.html
When COW is not explicitly requested to be disabled or enabled, the
function is supposed to do nothing on non-BTRFS file systems.
Fixes commit 7230bc95aa78379c9ee20cf59394c5fc4305b75b.
https://bugzilla.redhat.com/show_bug.cgi?id=1866157
Signed-off-by: Jiri Denemark <jdenemar redhat com>
---
src/util/virfile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/util/virfile.c src/util/virfile.c
index 6ada3a708c..7f22884b07 100644
--- src/util/virfile.c
+++ src/util/virfile.c
@@ -4522,7 +4522,7 @@ virFileSetCOW(const char *path,
}
if (buf.f_type != BTRFS_SUPER_MAGIC) {
- if (state == VIR_TRISTATE_BOOL_ABSENT) {
+ if (state != VIR_TRISTATE_BOOL_ABSENT) {
virReportSystemError(ENOSYS,
_("unable to control COW flag on '%s', not btrfs"),
path);

66
srcpkgs/libvirt/template
View file

@ -1,49 +1,53 @@
# Template file for 'libvirt' # Template file for 'libvirt'
pkgname=libvirt pkgname=libvirt
version=6.6.0 version=6.9.0
revision=4 revision=1
build_wrksrc="build" build_style=meson
build_style=gnu-configure configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
configure_script="../configure" hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
configure_args="--without-hal --with-storage-lvm --with-qemu iptables libxslt docbook-xsl dnsmasq libapparmor-devel python3-docutils gettext"
--with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf makedepends="readline-devel libcap-ng-devel attr-devel gnutls-devel
--with-interface --disable-static --with-apparmor --with-secdriver-apparmor libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel
--with-apparmor-profiles" device-mapper-devel eudev-libudev-devel libblkid-devel libpciaccess-devel
avahi-libs-devel polkit-devel yajl-devel jansson-devel python3-devel
libssh2-devel fuse-devel libtirpc-devel libapparmor-devel"
depends="iptables dnsmasq"
short_desc="Virtualization API for controlling virtualization engines" short_desc="Virtualization API for controlling virtualization engines"
maintainer="Helmut Pozimski <helmut@pozimski.eu>" maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="LGPL-2.1-or-later" license="LGPL-2.1-or-later"
homepage="https://libvirt.org" homepage="https://libvirt.org"
changelog="https://libvirt.org/news.html" changelog="https://libvirt.org/news.html"
distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
checksum=94e52ddd2d71b650e1a7eb5ab7e651f9607ecee207891216714020b8ff081ef9 checksum=0d8427ee1d0f448fb339f847838f63b1e7ca0c4acbd14f1faacb129c795cc0c1
# FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
system_accounts="libvirt" system_accounts="libvirt"
libvirt_groups="disk,kvm" libvirt_groups="disk,kvm"
hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel case "$XBPS_TARGET_MACHINE" in
iptables libxslt docbook-xsl dnsmasq python3 libapparmor-devel python3-docutils i686*) makedepends+=" libnuma-devel" ;;
gettext" x86_64*) makedepends+=" libnuma-devel xen-devel" ;;
makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel *) ;;
gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel esac
libparted-devel device-mapper-devel dbus-devel eudev-libudev-devel libblkid-devel
libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel jansson-devel
python3-devel libssh2-devel fuse-devel libtirpc-devel
libapparmor-devel"
depends="iptables dnsmasq"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
i686*) configure_args+=" --without-xl"; makedepends+=" libnuma-devel";; *-musl)
x86_64*) configure_args+=" --with-xl"; makedepends+=" libnuma-devel xen-devel";; CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc"
*) configure_args+=" --without-xen";;
esac
case "$XBPS_TARGET_MACHINE" in
*-musl) CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc"
hostmakedepends+=" rpcsvc-proto" hostmakedepends+=" rpcsvc-proto"
;; ;;
*)
# LTO apparently causes the linker to confuse the glibc symbol
# xdr_int64_t with that provided by libtirpc, causing a crash.
# https://gitlab.com/libvirt/libvirt/-/issues/92
configure_args+=" -Db_lto=false"
;;
esac esac
conf_files="/etc/libvirt/nwfilter/*.xml /etc/libvirt/qemu/networks/*.xml /etc/libvirt/*.conf" conf_files="
/etc/libvirt/nwfilter/*.xml
/etc/libvirt/qemu/networks/*.xml
/etc/libvirt/*.conf"
make_dirs=" make_dirs="
/var/lib/libvirt/uml 0755 root root /var/lib/libvirt/uml 0755 root root
/var/lib/libvirt/qemu/nvram 0755 root root /var/lib/libvirt/qemu/nvram 0755 root root
@ -58,14 +62,6 @@ make_dirs="
/var/libvirt/boot 0755 root root /var/libvirt/boot 0755 root root
/var/cache/libvirt/qemu 0755 root root" /var/cache/libvirt/qemu 0755 root root"
post_extract() {
mkdir -p build
}
pre_configure() {
autoreconf -fi ../
}
post_install() { post_install() {
# runit services # runit services
vsv libvirtd vsv libvirtd