diff options
Diffstat (limited to 'community/libvirt')
-rw-r--r-- | community/libvirt/APKBUILD | 191 | ||||
-rw-r--r-- | community/libvirt/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch | 35 | ||||
-rw-r--r-- | community/libvirt/musl-fix-includes.patch | 12 | ||||
-rw-r--r-- | community/libvirt/stderr-fix.patch | 13 |
4 files changed, 105 insertions, 146 deletions
diff --git a/community/libvirt/APKBUILD b/community/libvirt/APKBUILD index a85ee8bdc2c..77562968190 100644 --- a/community/libvirt/APKBUILD +++ b/community/libvirt/APKBUILD @@ -1,32 +1,77 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=libvirt -pkgver=8.3.0 +pkgver=10.1.0 _ver="${pkgver/_rc/-rc}" -pkgrel=0 -pkgdesc="A virtualization API for several hypervisor and container systems" +pkgrel=1 +pkgdesc="Virtualization API for several hypervisor and container systems" url="https://libvirt.org/" -# s390x and riscv64 blocked by polkit -arch="all !s390x !riscv64" +arch="all" options="!check" license="LGPL-2.1-or-later" -_daemon_deps="bridge-utils dmidecode dnsmasq ip6tables iptables" +_daemon_deps="bridge-utils dmidecode dnsmasq iptables" _client_deps="pm-utils gnutls-utils netcat-openbsd" depends="lvm2" -depends_dev="libtirpc-dev" -makedepends="augeas-dev cyrus-sasl-dev device-mapper - e2fsprogs-dev gnutls-dev libcap-ng-dev libgpg-error-dev - netcf-dev libnl3-dev libxml2-dev libxslt-dev libtasn1-dev - lvm2-dev lxc-dev libgcrypt-dev parted-dev perl pkgconfig - eudev-dev zlib-dev yajl-dev libpcap-dev curl-dev libpciaccess-dev - polkit-dev readline-dev linux-headers jansson-dev ceph-dev - $depends_dev perl-xml-xpath - fuse-dev util-linux libxml2-utils bash-completion $_daemon_deps $_client_deps - rpcsvc-proto py3-docutils meson ninja +depends_dev="$pkgname=$pkgver-r$pkgrel" +makedepends=" + $_client_deps + $_daemon_deps + $depends_dev + acl-dev + augeas-dev + bash-completion-dev + curl-dev + cyrus-sasl-dev + device-mapper + e2fsprogs-dev + eudev-dev + fuse3-dev + gnutls-dev + jansson-dev + libcap-ng-dev + libgcrypt-dev + libgpg-error-dev + libnl3-dev + libpcap-dev + libpciaccess-dev + libssh2-dev + libtasn1-dev + libtirpc-dev + libxml2-dev + libxslt-dev + linux-headers + lvm2-dev + lxc-dev + meson + netcf-dev + parted-dev + perl + perl-xml-xpath + polkit-dev + py3-docutils + qemu + qemu-pr-helper + readline-dev + rpcsvc-proto + util-linux + yajl-dev + zlib-dev " install="$pkgname.post-install" -subpackages="$pkgname-dbg $pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc $pkgname-client $pkgname-daemon - $pkgname-lang $pkgname-lxc $pkgname-qemu $pkgname-uml::noarch $pkgname-vbox - $pkgname-bash-completion:bashcomp:noarch" +subpackages=" + $pkgname-dbg + $pkgname-libs + $pkgname-dev + $pkgname-doc + $pkgname-client + $pkgname-daemon + $pkgname-daemon-openrc + $pkgname-lang + $pkgname-lxc + $pkgname-qemu + $pkgname-uml::noarch + $pkgname-vbox + $pkgname-bash-completion + " source="https://libvirt.org/sources/libvirt-$pkgver.tar.xz libvirt.confd libvirt.initd @@ -34,9 +79,6 @@ source="https://libvirt.org/sources/libvirt-$pkgver.tar.xz libvirt-guests.initd virtlogd.initd virtlockd.initd - musl-fix-includes.patch - stderr-fix.patch - libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch " if [ "$CARCH" = "x86_64" ]; then subpackages="$subpackages $pkgname-xen" @@ -57,93 +99,76 @@ subpackages="$subpackages $pkgname-common-drivers:_common_drivers" # - CVE-2019-10166 # - CVE-2019-10161 +case "$CARCH" in +arm*|x86) + ;; +*) + makedepends="$makedepends ceph-dev" + ;; +esac + build() { - # qemu sets libexec dir to /usr/lib/qemu - export ac_cv_path_QEMU_BRIDGE_HELPER="/usr/lib/qemu/qemu-bridge-helper" - [ "$CARCH" = x86_64 ] && local _xen_opt="--with-libxl" - [ "$CARCH" = x86_64 ] && local _zfs_opt="--with-storage-zfs" + # silence repetitive warnings + CFLAGS="$CFLAGS -Wno-inline" \ abuild-meson \ + -Db_lto=true \ --libexec=/usr/lib/$pkgname \ + -Dinit_script=openrc \ . output - meson configure output - meson compile ${JOBS:+-j ${JOBS}} -C output + meson configure --no-pager output + meson compile -C output } check() { - meson test --no-rebuild -v -C output + meson test --no-rebuild --print-errorlogs -C output } package() { - DESTDIR="$pkgdir" ninja -C output install - install -Dm755 $srcdir/$pkgname.initd $pkgdir/etc/init.d/libvirtd - install -Dm644 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd - install -Dm755 $srcdir/$pkgname-guests.initd $pkgdir/etc/init.d/libvirt-guests - install -Dm644 $srcdir/$pkgname-guests.confd $pkgdir/etc/conf.d/libvirt-guests + DESTDIR="$pkgdir" meson install --no-rebuild -C output + install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/libvirtd + install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/libvirtd + install -Dm755 "$srcdir"/$pkgname-guests.initd "$pkgdir"/etc/init.d/libvirt-guests + install -Dm644 "$srcdir"/$pkgname-guests.confd "$pkgdir"/etc/conf.d/libvirt-guests - install -Dm755 $srcdir/virtlogd.initd $pkgdir/etc/init.d/virtlogd - install -Dm755 $srcdir/virtlockd.initd $pkgdir/etc/init.d/virtlockd + install -Dm755 "$srcdir"/virtlogd.initd "$pkgdir"/etc/init.d/virtlogd + install -Dm755 "$srcdir"/virtlockd.initd "$pkgdir"/etc/init.d/virtlockd install -d "$pkgdir"/lib/modules-load.d echo "tun" > "$pkgdir"/lib/modules-load.d/libvirt.conf rm -rf "$pkgdir"/etc/sysconfig rm -rf "$pkgdir"/usr/lib/charset.alias + rm -f "$pkgdir"/usr/lib/sysctl.d/60-qemu-postcopy-migration.conf rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } dev() { default_dev - mkdir -p "$subpkgdir"/usr/share/libvirt - mv "$pkgdir"/usr/share/libvirt/api \ - "$subpkgdir"/usr/share/libvirt/ + + amove usr/share/libvirt/api } daemon() { cd "$builddir" pkgdesc="libvirt daemon package" - depends="libvirt-client $_daemon_deps" + depends="libvirt-client=$pkgver-r$pkgrel $_daemon_deps" replaces="libvirt" - mkdir -p "$subpkgdir"/etc/$pkgname \ - "$subpkgdir"/etc/logrotate.d \ - "$subpkgdir"/usr/sbin - mv "$pkgdir"/etc/init.d "$subpkgdir"/etc - mv "$pkgdir"/etc/conf.d "$subpkgdir"/etc - mv "$pkgdir"/lib/modules-load.d "$subpkgdir"/lib - mv "$pkgdir"/etc/$pkgname/libvirtd.conf "$subpkgdir"/etc/libvirt/ - mv "$pkgdir"/usr/sbin/libvirtd "$subpkgdir"/usr/sbin/ - mv "$pkgdir"/etc/logrotate.d/libvirtd "$subpkgdir"/etc/logrotate.d/ - chmod +x "$subpkgdir"/etc/init.d/* + + amove lib/modules-load.d + amove etc/libvirt/libvirtd.conf + amove usr/sbin/libvirtd + amove etc/logrotate.d/libvirtd } client() { cd "$builddir" pkgdesc="libvirt client package" - depends="libvirt $_client_deps" + depends="libvirt=$pkgver-r$pkgrel $_client_deps" replaces="libvirt" - mkdir -p "$subpkgdir"/etc/$pkgname "$subpkgdir"/usr/bin \ - "$subpkgdir"/usr/lib - mv "$pkgdir"/etc/$pkgname/$pkgname.conf "$subpkgdir"/etc/libvirt/ - mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ -} -static() { - pkgdesc="$pkgname static libraries" - mkdir -p "$subpkgdir"/usr/lib - cd "$pkgdir" - for _lib in $(find . -name '*.a'); do - mkdir -p "$subpkgdir"/${_lib%/*} - mv "$_lib" "$subpkgdir"/${_lib%/*}/ - done -} - -bashcomp() { - depends="" - pkgdesc="Bash completions for $pkgname" - install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - mkdir -p "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/bash-completion \ - "$subpkgdir"/usr/share/ + amove etc/libvirt/libvirt.conf + amove usr/bin } _mv_driver() { @@ -164,9 +189,9 @@ _mv_driver() { local _d cd "$pkgdir" for _d in $_drivers; do - find * -name "*$_d[.-]*" -o -name "*$_d" | while read _f; do - mkdir -p "$subpkgdir"/${_f%/*} - mv "$pkgdir"/$_f "$subpkgdir"/$_f + # shellcheck disable=1087 + find . -name "*$_d[.-]*" -o -name "*$_d" | while read -r _f; do + amove $_f done done } @@ -180,23 +205,17 @@ vbox() { _mv_driver "VirtualBox" vbox; } _common_drivers() { pkgdesc="Common libvirt daemon drivers" replaces="libvirt" - mkdir -p "$subpkgdir"/usr/lib/libvirt \ - "$subpkgdir"/etc/libvirt/nwfilter - mv "$pkgdir"/usr/lib/libvirt/connection-driver \ - "$subpkgdir"/usr/lib/libvirt/ - mv "$pkgdir"/etc/libvirt/nwfilter \ - "$subpkgdir"/etc/libvirt/ + + amove etc/libvirt/nwfilter + amove usr/lib/libvirt/connection-driver } sha512sums=" -914c8a4884d703f368849b852ba8330d1b17cf598a359f70d344e0a94e02f60337216e9011cbeba90eb4e87fa644e7eb9e8a407ca58632b2b41511d3f598ff71 libvirt-8.3.0.tar.xz +08e73ae15de5681430b62db85ec9901242dca5e9a4ca9685614f4a67092c6e28f27f9187144b3ceb18ad6b40e6eb1a90b1a4b056b0888724d04a62002ee2bc48 libvirt-10.1.0.tar.xz c3647366e589f2134599baefcbd7ec480cbc0830c71f95cd903cacb28e463d4cd8d972fbd1db81aa17eef81c1f701bd3937c9b8eb71d56ee630e1ed8b89887e9 libvirt.confd 4e28dc733a5db0e102ed529f3215d44c52ce0495dc109e2ef53465a0e205e2ba6f5f0ff56cc6e27318572ca560d778dd24a3faf092e7ab7819674c42876aa764 libvirt.initd 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc libvirt-guests.confd ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0 libvirt-guests.initd f93313c387c21bafb760f599942f1cdecfe952af80af42a28e8525118e5a7fd512d9f909039d8b15f1a544957f1d70a0728c55de2bae41a87e5be6dbbb4f6208 virtlogd.initd d8ef64d76e8be521a6551893cc7c6aa7e5d8c627a9aed87beefefc126798dc0f98bf420609b6afc027ad96cca347a1c5db8f703d09853efde4d1a6a35572fbf1 virtlockd.initd -dfe042c596028125bf8548115de2922683829c4716f6b0efb8efc38518670e3e848481661b9714bb0664c1022b87e8f3c0773611fe10187b0bc588e2336ada0c musl-fix-includes.patch -d32551d56eae2c33bab7571964f76421336967918c293cd1d18fc66626a7ead3551b5672a9e3fc3d8b7bca82cc0abb17e428ee8271d04d73bc06fd16309918b3 stderr-fix.patch -dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2 libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch " diff --git a/community/libvirt/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch b/community/libvirt/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch deleted file mode 100644 index bf7a328f775..00000000000 --- a/community/libvirt/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e97700d867ffa949c97f8a635a76b9ce510e806f Mon Sep 17 00:00:00 2001 -Message-Id: <e97700d867ffa949c97f8a635a76b9ce510e806f.1580460243.git.mprivozn@redhat.com> -In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com> -References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com> -From: Michal Privoznik <mprivozn@redhat.com> -Date: Fri, 31 Jan 2020 09:42:14 +0100 -Subject: [PATCH 2/3] Fix paths in libvirt-guests.sh.in - -Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---- - tools/libvirt-guests.sh.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in -index a881f6266e..79d38b3e9a 100644 ---- a/tools/libvirt-guests.sh.in -+++ b/tools/libvirt-guests.sh.in -@@ -39,11 +39,11 @@ START_DELAY=0 - BYPASS_CACHE=0 - SYNC_TIME=0 - --test -f "$sysconfdir"/sysconfig/libvirt-guests && -- . "$sysconfdir"/sysconfig/libvirt-guests -+test -f "$sysconfdir"/libvirt/libvirt-guests.conf && -+ . "$sysconfdir"/libvirt/libvirt-guests.conf - - LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests --VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests -+VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests - - RETVAL=0 - --- -2.24.1 - diff --git a/community/libvirt/musl-fix-includes.patch b/community/libvirt/musl-fix-includes.patch deleted file mode 100644 index 6b7cee93d5a..00000000000 --- a/community/libvirt/musl-fix-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c -index 0837443..0954e11 100644 ---- a/src/storage/storage_backend_fs.c -+++ b/src/storage/storage_backend_fs.c -@@ -26,6 +26,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <paths.h> - - #include "virerror.h" - #include "storage_backend_fs.h" diff --git a/community/libvirt/stderr-fix.patch b/community/libvirt/stderr-fix.patch deleted file mode 100644 index 9d26721872c..00000000000 --- a/community/libvirt/stderr-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/qemu/qemu_process.c 2019-03-07 18:52:23.722271821 +0100 -+++ b/src/qemu/qemu_process.c 2019-03-07 18:53:53.129064501 +0100 -@@ -92,6 +92,10 @@ - - VIR_LOG_INIT("qemu.qemu_process"); - -+#ifdef stderr -+# undef stderr -+#endif -+ - /** - * qemuProcessRemoveDomainStatus - * |