diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | PKGBUILD | 88 | ||||
| -rw-r--r-- | libvirt.install | 33 | ||||
| -rw-r--r-- | libvirtd-guests.conf.d | 20 | ||||
| -rw-r--r-- | libvirtd.conf.d | 4 |
5 files changed, 95 insertions, 80 deletions
@@ -1,6 +1,6 @@ pkgbase = libvirt-git pkgdesc = API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc) - pkgver = VE.2015.5313.87.g7bf3c13 + pkgver = pkgver=1.3.3.178.g727a3c5 pkgrel = 1 url = http://libvirt.org/ install = libvirt.install @@ -13,6 +13,7 @@ pkgbase = libvirt-git makedepends = linux-api-headers makedepends = dnsmasq makedepends = libxslt + makedepends = perl-xml-xpath makedepends = xhtml-docs depends = e2fsprogs depends = gnutls @@ -20,15 +21,15 @@ pkgbase = libvirt-git depends = libxml2 depends = parted depends = polkit - depends = python + depends = python2 depends = avahi depends = yajl depends = libpciaccess depends = udev - depends = dbus-core + depends = dbus depends = libxau depends = libxdmcp - depends = libpcap + depends = libpcap-ng depends = curl depends = libsasl depends = libgcrypt @@ -39,22 +40,27 @@ pkgbase = libvirt-git depends = iproute2 depends = libnl depends = libx11 + depends = numactl + depends = gettext + depends = ceph + depends = libssh2 + depends = netcf depends = perl-xml-xpath - optdepends = bridge-utils: for briged networking (default) + optdepends = ebtables optdepends = dnsmasq: for NAT/DHCP for guests + optdepends = bridge-utils: for briged networking (default) optdepends = openbsd-netcat: for remote management over ssh optdepends = qemu optdepends = radvd optdepends = dmidecode - optdepends = ebtables optdepends = pm-utils: host power management - optdepends = audit provides = libvirt conflicts = libvirt options = emptydirs backup = etc/conf.d/libvirt-guests backup = etc/conf.d/libvirtd backup = etc/libvirt/libvirt.conf + backup = etc/libvirt/virtlogd.conf backup = etc/libvirt/libvirtd.conf backup = etc/libvirt/lxc.conf backup = etc/libvirt/nwfilter/allow-arp.xml @@ -89,10 +95,12 @@ pkgbase = libvirt-git source = libvirtd.conf.d source = libvirtd-guests.conf.d source = libvirt.tmpfiles.d - sha512sums = SKIP - sha512sums = eebc616fcdf3c92338f3967f99701ed2d156d4a3835c31aebe8299b2f5fe00717f09ee2da79b3d5810348033f0b82ff05c70a775a8309d886919e75fa862e302 - sha512sums = 9012a2bd2b262a6f95d739f97b6ebc6938310616aca05d501efd9d3fc69d71500366dcfe9046a37f8ce30929bcd6eea9cf6770cf757998ecce4b475a25914801 - sha512sums = 9e3e9f479b17528d70e812e6851cf4209ad73b577d478170bf7d80f075be4f2ee2e28adbe1e542002bbaea15e34830ff60e4ca2e34a5ac5a925440ca25864c31 + source = systemd.patch::https://bugs.archlinux.org/task/48440?getfile=13914 + md5sums = SKIP + md5sums = 5e31269067dbd12ca871234450bb66bb + md5sums = 384fff96c6248d4f020f6fa66c32b357 + md5sums = 020971887442ebbf1b6949e031c8dd3f + md5sums = 8b5cb657b3fa08c3cd888d48a2227a39 pkgname = libvirt-git @@ -1,35 +1,39 @@ +# $Id$ # Maintainer: Arthur Borsboom <arthurborsboom@gmail.com> # Contributor: Jonas Heinrich <onny@project-insanity.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt-git -pkgver=VE.2015.5313.87.g7bf3c13 +pkgver=1.3.3.178.g727a3c5 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" license=('LGPL') -depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python' - 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' +depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' + 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus' 'libxau' 'libxdmcp' 'libpcap' 'libcap-ng' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'libnl' 'libx11' 'perl-xml-xpath') -makedepends=('git' 'pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'libxslt' 'xhtml-docs') -optdepends=('bridge-utils: for briged networking (default)' - 'dnsmasq: for NAT/DHCP for guests' + 'iproute2' 'libnl' 'libx11' 'numactl' 'gettext' 'ceph' 'libssh2' 'netcf' 'perl-xml-xpath') +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' + 'libiscsi' + 'perl-xml-xpath' 'libxslt' + 'git' 'xhtml-docs') +optdepends=('ebtables: required for default NAT networking' + 'dnsmasq: required for default NAT/DHCP for guests' + 'bridge-utils: for bridged networking' 'openbsd-netcat: for remote management over ssh' 'qemu' 'radvd' 'dmidecode' - 'ebtables' - 'pm-utils: host power management' - 'audit') + 'pm-utils: host power management') conflicts=('libvirt') provides=('libvirt') options=('emptydirs') backup=('etc/conf.d/libvirt-guests' 'etc/conf.d/libvirtd' 'etc/libvirt/libvirt.conf' + 'etc/libvirt/virtlogd.conf' 'etc/libvirt/libvirtd.conf' 'etc/libvirt/lxc.conf' 'etc/libvirt/nwfilter/allow-arp.xml' @@ -64,32 +68,64 @@ install="libvirt.install" source=('git+git://libvirt.org/libvirt.git' libvirtd.conf.d libvirtd-guests.conf.d - libvirt.tmpfiles.d) -sha512sums=('SKIP' - 'eebc616fcdf3c92338f3967f99701ed2d156d4a3835c31aebe8299b2f5fe00717f09ee2da79b3d5810348033f0b82ff05c70a775a8309d886919e75fa862e302' - '9012a2bd2b262a6f95d739f97b6ebc6938310616aca05d501efd9d3fc69d71500366dcfe9046a37f8ce30929bcd6eea9cf6770cf757998ecce4b475a25914801' - '9e3e9f479b17528d70e812e6851cf4209ad73b577d478170bf7d80f075be4f2ee2e28adbe1e542002bbaea15e34830ff60e4ca2e34a5ac5a925440ca25864c31') - + libvirt.tmpfiles.d + 'systemd.patch::https://bugs.archlinux.org/task/48440?getfile=13914') +md5sums=('SKIP' + '5e31269067dbd12ca871234450bb66bb' + '384fff96c6248d4f020f6fa66c32b357' + '020971887442ebbf1b6949e031c8dd3f' + '8b5cb657b3fa08c3cd888d48a2227a39') + pkgver() { - cd "$SRCDEST/libvirt" + cd "$SRCDEST/${pkgname/-git/}" git describe --always | sed 's|-|.|g' | sed 's/^.//' } +prepare() { + cd "$srcdir/${pkgname/-git/}" + + for file in $(find . -name '*.py' -print); do + sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + sed -i 's|/sysconfig/|/conf.d/|g' \ + daemon/libvirtd.service.in \ + tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \ + src/locking/virtlockd.service.in + sed -i 's|@sbindir@|/usr/bin|g' src/locking/virtlockd.service.in + # 78 is kvm group: https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database + sed -i 's|#group =.*|group="78"|' src/qemu/qemu.conf + sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \ + src/qemu/qemu{.conf,_conf.c} \ + src/qemu/test_libvirtd_qemu.aug.in + + sed -i 's/notify/simple/' daemon/libvirtd.service.in + + patch -p1 -i $srcdir/systemd.patch +} + build() { - cd "$srcdir/libvirt" + cd "$srcdir/${pkgname/-git/}" + export PYTHON=`which python2` export LDFLAGS=-lX11 export RADVD=/usr/bin/radvd - NOCONFIGURE=1 ./autogen.sh - ./configure --prefix=/usr --libexec=/usr/lib/"${pkgname/-git/}" --sbindir=/usr/bin --with-init-script=systemd + NOCONFIGURE=1 ./autogen.sh + sed -i 's|libsystemd-daemon|libsystemd|g' configure + + [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"${pkgname/-git/}" --sbindir=/usr/bin \ + --with-storage-lvm --with-udev --without-hal --disable-static \ + --with-init-script=systemd \ + --with-qemu-user=nobody --with-qemu-group=nobody \ + --with-netcf --with-interface + # --with-audit make - - sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service - sed -i 's|@sbindir@|/usr/bin|g' src/virtlockd.service } package() { - cd "$srcdir/libvirt" + cd "$srcdir/${pkgname/-git/}" + make DESTDIR="$pkgdir" install install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd @@ -105,7 +141,5 @@ package() { rm -rf \ "$pkgdir"/var/run \ "$pkgdir"/etc/sysconfig \ - "$pkgdir"/etc/rc.d/init.d \ - "$pkgdir"/lib \ - "$pkgdir"/etc/sysctl.d + "$pkgdir"/etc/rc.d } diff --git a/libvirt.install b/libvirt.install index 4f674c9f223e..706a20a7de35 100644 --- a/libvirt.install +++ b/libvirt.install @@ -1,39 +1,16 @@ _libvirt_setup() { systemd-tmpfiles --create libvirt.conf - rm -f /usr/lib/python?.?/site-packages/libvirt.pyc - echo ">>> To use libvirt as a non-root user:" - echo ">>> Use polkit to grant access." - echo ">>> ...or change the access model in /etc/libvirt/libvirtd.conf." - echo ">>> (see unixperms.patch in PKGBUILD for help)" - echo "" } post_install() { _libvirt_setup || return 1 - echo ">>> Be sure to see optdepends as you may find some of them helpful." - echo ">>> Especially: bridge-utils, dnsmasq, and hal." - echo "" - echo ">>> To start libvirt as a daemon (service) run" - echo " 'systemctl start libvirtd'" - echo "" - echo ">>> To start libvirt as a daemon (service) on boot:" - echo " 'systemctl enable libvirtd'" - echo "" + groupadd -r -f libvirt + echo ">>> libvirt runs qemu from nobody:kvm by default" + echo ">>> change the USER if desired in /etc/libvirt/qemu.conf" + echo ">>> See https://wiki.archlinux.org/index.php/Libvirt for more info" } post_upgrade() { _libvirt_setup || return 1 - echo ">>> To finish the upgrade, restart libvirtd by:" - echo ">>> 'systemctl restart libvirtd' as root (systemd)" - echo ">>> or reboot." - echo ">>> You may also need to run 'rm -rf ~/.libvirt'" - echo "" -} - -post_remove() { - rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc - echo ">>> You may wish to delete the group 'libvirt' if it still exists." - echo ">>> It can be removed by running 'groupdel libvirt' as root." - echo "" - depmod -a + echo ">>> You may need to run 'rm -rf ~/.libvirt'" } diff --git a/libvirtd-guests.conf.d b/libvirtd-guests.conf.d index dd987611bfdb..10e80a606915 100644 --- a/libvirtd-guests.conf.d +++ b/libvirtd-guests.conf.d @@ -1,11 +1,9 @@ -LIBVIRTD_STOP_ACTION=suspend - -#LIBVIRTD_URI="-c qemu+ssh://user@host/system" -LIBVIRTD_URI="" - -#LIBVIRTD_BYPASS_CACHE="--bypass-cache" -LIBVIRTD_BYPASS_CACHE="" - -LIBVIRTD_START_DELAY=0 - -LIBVIRTD_SHUTDOWN_TIMEOUT=60 +BYPASS_CACHE=0 +CONNECT_RETRIES=10 +ON_BOOT=start +ON_SHUTDOWN=suspend +PARALLEL_SHUTDOWN=0 +RETRIES_SLEEP=1 +SHUTDOWN_TIMEOUT=300 +START_DELAY=0 +URIS=default diff --git a/libvirtd.conf.d b/libvirtd.conf.d index d4d25b47a602..e2e87c8dab93 100644 --- a/libvirtd.conf.d +++ b/libvirtd.conf.d @@ -1,3 +1 @@ -LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" -LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" -KRB5_KTNAME="/etc/libvirt/krb5.tab" +LIBVIRTD_ARGS="" |