diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-30 13:59:14 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-30 13:59:14 +0200 |
| commit | c9f24b5e67b10a25e7ffa9afaefbd6ca76342940 (patch) | |
| tree | d40774a5451822f227e9b59122fae865b02d0254 /community/libvirt | |
| parent | e7fca19e8659c6c5b6fbb34527b129e655514f1e (diff) | |
| parent | 08483ba66f8da1bbec05f93e5e3493d3794c02bb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cinnamon-control-center/PKGBUILD
community/fbshot/PKGBUILD
community/fltk2/PKGBUILD
community/log4cpp/PKGBUILD
community/pion/PKGBUILD
Diffstat (limited to 'community/libvirt')
| -rw-r--r-- | community/libvirt/PKGBUILD | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index bce3c6444..7e2817cb0 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87474 2013-04-01 10:35:45Z spupykin $ +# $Id: PKGBUILD 89422 2013-04-29 11:34:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -61,10 +61,15 @@ build() { --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 + sed -i \ + -e 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' \ + -e 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' \ + -e 's|After=.*|After=syslog.target network.target libvirtd.service|' \ + tools/libvirt-guests.service sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service + sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf } package() { @@ -82,9 +87,6 @@ package() { install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf 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 rm -rf \ "$pkgdir"/var/run \ |