aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2020-10-02 09:34:27 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2020-10-02 09:35:27 +0000
commiteba266298a7a6aad2c4b00d4af59e8c59a7c3c52 (patch)
tree07580386225f85fecb75ec881e38fed19843224d
parent40f198f43d881032f9b35bcd1ff163080a0b76d5 (diff)
downloadaports-eba266298a7a6aad2c4b00d4af59e8c59a7c3c52.tar.gz
aports-eba266298a7a6aad2c4b00d4af59e8c59a7c3c52.tar.bz2
aports-eba266298a7a6aad2c4b00d4af59e8c59a7c3c52.tar.xz
community/libvirt: upgrade to 6.8.0. Switched to meson
-rw-r--r--community/libvirt/APKBUILD35
1 files changed, 10 insertions, 25 deletions
diff --git a/community/libvirt/APKBUILD b/community/libvirt/APKBUILD
index 08f1cf0cf9..cf29bee97e 100644
--- a/community/libvirt/APKBUILD
+++ b/community/libvirt/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=libvirt
-pkgver=6.6.0
+pkgver=6.8.0
_ver="${pkgver/_rc/-rc}"
-pkgrel=4
+pkgrel=0
pkgdesc="A virtualization API for several hypervisor and container systems"
url="https://libvirt.org/"
arch="all !mips !mips64 !s390x" # polkit
@@ -20,7 +20,7 @@ makedepends="augeas-dev cyrus-sasl-dev device-mapper
polkit-dev readline-dev linux-headers jansson-dev
$depends_dev perl-xml-xpath
fuse-dev util-linux libxml2-utils bash-completion $_daemon_deps $_client_deps
- automake autoconf libtool rpcsvc-proto py3-docutils
+ rpcsvc-proto py3-docutils meson ninja
"
install="$pkgname.post-install"
subpackages="$pkgname-dbg $pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc $pkgname-client $pkgname-daemon
@@ -56,8 +56,6 @@ subpackages="$subpackages $pkgname-common-drivers:_common_drivers"
prepare() {
default_prepare
mkdir -p build
- cd build
- autoreconf -fi ../
}
build() {
@@ -66,32 +64,18 @@ build() {
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 \
+ meson \
--prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --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-group=kvm \
- --with-qemu-user=qemu
- make
+ --libexec=/usr/lib/$_pkgname \
+ --sysconfdir=/etc
+ ninja
}
package() {
cd build
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja 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.initd $pkgdir/etc/init.d/libvirt-guests
install -Dm644 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirt-guests
@@ -101,6 +85,7 @@ package() {
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
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
@@ -200,7 +185,7 @@ _common_drivers() {
"$subpkgdir"/etc/libvirt/
}
-sha512sums="55091addcf43d3c0bdd50f9378b588351181d191272d5a19220a0babe0893c1f6e0f1e41a7f51b8c1fb8e2098236b273e1a18b81573f4008ee3cf65374ba9465 libvirt-6.6.0.tar.xz
+sha512sums="9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9 libvirt-6.8.0.tar.xz
c3647366e589f2134599baefcbd7ec480cbc0830c71f95cd903cacb28e463d4cd8d972fbd1db81aa17eef81c1f701bd3937c9b8eb71d56ee630e1ed8b89887e9 libvirt.confd
95debe7600826a6783334f5bf042fde81d0a01f2c599eb8d2f66e0597cf52116c13d4d5cf173784a360d134a7c44d9bf828e8f78f7e10a1ad9dada537aead480 libvirt.initd
78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc libvirt-guests.confd