From ca2aab15b8d6f30959f6a343b30d96ecf51ba495 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 18 Oct 2020 09:55:10 -0400 Subject: [PATCH] libvirt: update to 6.9.0. --- .../libvirt/patches/fix-virFileSetCOW.patch | 27 -------- srcpkgs/libvirt/template | 66 +++++++++---------- 2 files changed, 31 insertions(+), 62 deletions(-) delete mode 100644 srcpkgs/libvirt/patches/fix-virFileSetCOW.patch diff --git a/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch b/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch deleted file mode 100644 index a0fc0786de..0000000000 --- a/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch +++ /dev/null @@ -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 ---- - 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); diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index cc07eca3d0..4da40ef692 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,49 +1,53 @@ # Template file for 'libvirt' pkgname=libvirt -version=6.6.0 -revision=4 -build_wrksrc="build" -build_style=gnu-configure -configure_script="../configure" -configure_args="--without-hal --with-storage-lvm --with-qemu - --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf - --with-interface --disable-static --with-apparmor --with-secdriver-apparmor - --with-apparmor-profiles" +version=6.9.0 +revision=1 +build_style=meson +configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run" +hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel + iptables libxslt docbook-xsl dnsmasq libapparmor-devel python3-docutils gettext" +makedepends="readline-devel libcap-ng-devel attr-devel gnutls-devel + libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel + 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" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://libvirt.org" changelog="https://libvirt.org/news.html" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=94e52ddd2d71b650e1a7eb5ab7e651f9607ecee207891216714020b8ff081ef9 +checksum=0d8427ee1d0f448fb339f847838f63b1e7ca0c4acbd14f1faacb129c795cc0c1 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 system_accounts="libvirt" libvirt_groups="disk,kvm" -hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel - iptables libxslt docbook-xsl dnsmasq python3 libapparmor-devel python3-docutils - gettext" -makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel - gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel - 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 + i686*) makedepends+=" libnuma-devel" ;; + x86_64*) makedepends+=" libnuma-devel xen-devel" ;; + *) ;; +esac case "$XBPS_TARGET_MACHINE" in - i686*) configure_args+=" --without-xl"; makedepends+=" libnuma-devel";; - x86_64*) configure_args+=" --with-xl"; makedepends+=" libnuma-devel xen-devel";; - *) configure_args+=" --without-xen";; -esac -case "$XBPS_TARGET_MACHINE" in - *-musl) CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc" + *-musl) + CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc" 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 -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=" /var/lib/libvirt/uml 0755 root root /var/lib/libvirt/qemu/nvram 0755 root root @@ -58,14 +62,6 @@ make_dirs=" /var/libvirt/boot 0755 root root /var/cache/libvirt/qemu 0755 root root" -post_extract() { - mkdir -p build -} - -pre_configure() { - autoreconf -fi ../ -} - post_install() { # runit services vsv libvirtd