Commit 22cf1509 authored by Francesco Colista's avatar Francesco Colista

main/libvirt: upgrade to 5.1.0, added zfs support

parent 46a92ee5
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=libvirt
pkgver=5.0.0
pkgver=5.1.0
_ver="${pkgver/_rc/-rc}"
pkgrel=1
pkgrel=0
pkgdesc="A virtualization API for several hypervisor and container systems"
url="http://libvirt.org/"
arch="all"
......@@ -17,12 +17,12 @@ makedepends="augeas-dev bridge-utils cyrus-sasl-dev device-mapper
lvm2-dev lxc-dev gnutls-dev libgcrypt-dev parted-dev perl pkgconfig
eudev-dev zlib-dev yajl-dev libpcap-dev curl-dev libpciaccess-dev
polkit-dev readline-dev dnsmasq linux-headers libssh2-dev jansson-dev
$depends_dev
$depends_dev perl-xml-xpath
fuse-dev util-linux libxml2-utils bash-completion $_daemon_deps $_client_deps
"
install="$pkgname.post-install"
subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc $pkgname-client $pkgname-daemon
$pkgname-lang $pkgname-lxc $pkgname-qemu $pkgname-uml $pkgname-vbox
$pkgname-lang $pkgname-lxc $pkgname-qemu $pkgname-uml::noarch $pkgname-vbox
$pkgname-bash-completion:bashcomp:noarch"
source="https://libvirt.org/sources/$pkgname-$pkgver.tar.xz
libvirt.confd
......@@ -30,11 +30,11 @@ source="https://libvirt.org/sources/$pkgname-$pkgver.tar.xz
virtlogd.initd
virtlockd.initd
musl-fix-includes.patch
stderr-fix.patch
"
if [ "$CARCH" = "x86_64" ]; then
subpackages="$subpackages $pkgname-xen"
makedepends="$makedepends xen-dev"
makedepends="$makedepends xen-dev zfs"
fi
subpackages="$subpackages $pkgname-common-drivers:_common_drivers"
......@@ -45,6 +45,7 @@ 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"
./configure \
--build=$CBUILD \
--host=$CHOST \
......@@ -54,11 +55,12 @@ build() {
--infodir=/usr/share/info \
--libexec=/usr/lib/"$pkgname" \
$_xen_opt \
$_zfs_opt \
--with-polkit \
--with-storage-fs \
--with-storage-lvm \
--enable-static \
--with-qemu \
--with-qemu
make
}
......@@ -172,9 +174,10 @@ _common_drivers() {
"$subpkgdir"/etc/libvirt/
}
sha512sums="d93042f49d2550d14577b5257c548d7108462fe1ad69420c128acf094ffd3e80deb744db13d4c3d5fbe5e4c1826d13131be12e3413710711a2d8cba6cb5a9db9 libvirt-5.0.0.tar.xz
sha512sums="ca64d7be683614bdeb20a8865655fe80f911cf13c00aed2334db3a2e4131e1dd6fe5e9663a24e6f82161ad5aa53f1a2637cd21730eed46e4764b7eebced94f3f libvirt-5.1.0.tar.xz
9aba6ab73219a635c64a340ee8887356e644445c9128734cbce73f5d54778378da2f10a190365ad88a7db8bc95b1fb17f0c6ca41fc41bb786c09e1afe84d65dc libvirt.confd
734afb83b7a4703dd238f1d89dbc853a8c73bcf1994af648c41ab01ae4088e5c7a423f0cb91e5e31f2ae5e60c66d08a6e1583a1e3b88bb5554e0f9fd15ecc15c libvirt.initd
36b85f473d292be8df415256d01a562131d8ae61450ba3893658090a12d589ca32215382f56f286a830b4e59ffd98fbe1d92004f2ce14ca0834451b943cd8f2f virtlogd.initd
a4c4d26e4111931acbe7594451bf963a36c8db33c64b1bc447ab4758bb92803510bebee0511d6bc16ba80c289ab6f87e74377d47bf560412f9adb9c161a206d9 virtlockd.initd
dfe042c596028125bf8548115de2922683829c4716f6b0efb8efc38518670e3e848481661b9714bb0664c1022b87e8f3c0773611fe10187b0bc588e2336ada0c musl-fix-includes.patch"
dfe042c596028125bf8548115de2922683829c4716f6b0efb8efc38518670e3e848481661b9714bb0664c1022b87e8f3c0773611fe10187b0bc588e2336ada0c musl-fix-includes.patch
d32551d56eae2c33bab7571964f76421336967918c293cd1d18fc66626a7ead3551b5672a9e3fc3d8b7bca82cc0abb17e428ee8271d04d73bc06fd16309918b3 stderr-fix.patch"
--- 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
*
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment