summaryrefslogtreecommitdiff
path: root/community/libvirt
diff options
context:
space:
mode:
Diffstat (limited to 'community/libvirt')
-rw-r--r--community/libvirt/PKGBUILD32
-rw-r--r--community/libvirt/libvirt.tmpfiles.d8
2 files changed, 21 insertions, 19 deletions
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index b03cd36c6..5b05c4255 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82286 2013-01-14 10:03:34Z spupykin $
+# $Id: PKGBUILD 83324 2013-01-29 14:07:39Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=libvirt
pkgver=1.0.1
-pkgrel=2
+pkgrel=4
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64')
url="http://libvirt.org/"
@@ -12,7 +12,7 @@ license=('LGPL')
depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
- 'iproute2' 'netcf' 'libnl' 'libx11')
+ 'iproute2' 'libnl' 'libx11' 'audit')
makedepends=('pkgconfig' 'lvm2' 'linux-api-headers')
optdepends=('bridge-utils: for briged networking (default)'
'dnsmasq: for NAT/DHCP for guests'
@@ -40,7 +40,7 @@ md5sums=('86a8c0acabb01e11ac84fe00624dc54e'
'3ed0e24f5b5e25bf553f5427d64915e6'
'0ee5b6c58590ff392a266f20f7928d1f'
'0a96ed876ffb1fcb9dff5a9b3a609c1e'
- '8d98e62915785686b0b6c8c070628392')
+ '020971887442ebbf1b6949e031c8dd3f')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -56,8 +56,10 @@ build() {
export RADVD=/usr/sbin/radvd
[ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
--with-storage-lvm --without-xen --with-udev --without-hal --disable-static \
- --with-init-script=systemd
- make -j1
+ --with-init-script=systemd --with-audit \
+ --with-qemu-user=nobody --with-qemu-group=nobody \
+ --without-netcf --with-interface
+ make
sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service
sed -i 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' tools/libvirt-guests.service
sed -i 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' tools/libvirt-guests.service
@@ -76,21 +78,21 @@ package() {
install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests
- install -dm0755 $pkgdir/usr/lib/sysctl.d
- mv $pkgdir/etc/sysctl.d/libvirtd $pkgdir/usr/lib/sysctl.d/libvirtd
+ install -dm0755 "$pkgdir"/usr/lib/sysctl.d
+ mv "$pkgdir"/etc/sysctl.d/libvirtd "$pkgdir"/usr/lib/sysctl.d/libvirtd.conf
# systemd stuff
install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf
- mv $pkgdir/lib/* $pkgdir/usr/lib/
+ mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
sed -i \
's|After=.*|After=syslog.target network.target libvirtd.service|' \
- $pkgdir/usr/lib/systemd/system/libvirt-guests.service
+ "$pkgdir"/usr/lib/systemd/system/libvirt-guests.service
rm -rf \
- $pkgdir/var/run \
- $pkgdir/etc/sysconfig \
- $pkgdir/etc/rc.d/init.d \
- $pkgdir/lib \
- $pkgdir/etc/sysctl.d
+ "$pkgdir"/var/run \
+ "$pkgdir"/etc/sysconfig \
+ "$pkgdir"/etc/rc.d/init.d \
+ "$pkgdir"/lib \
+ "$pkgdir"/etc/sysctl.d
}
diff --git a/community/libvirt/libvirt.tmpfiles.d b/community/libvirt/libvirt.tmpfiles.d
index 0cec93271..2804c43c8 100644
--- a/community/libvirt/libvirt.tmpfiles.d
+++ b/community/libvirt/libvirt.tmpfiles.d
@@ -1,4 +1,4 @@
-d /var/run/libvirt/qemu 0755 root root -
-d /var/run/libvirt/lxc 0755 root root -
-d /var/run/libvirt/uml 0755 root root -
-d /var/run/libvirt/network 0755 root root -
+d /run/libvirt/qemu 0755 root root -
+d /run/libvirt/lxc 0755 root root -
+d /run/libvirt/uml 0755 root root -
+d /run/libvirt/network 0755 root root -