diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /community/libvirt/PKGBUILD | |
parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'community/libvirt/PKGBUILD')
-rw-r--r-- | community/libvirt/PKGBUILD | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 9f1501a8b..32d80a6de 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70825 2012-05-17 09:48:45Z spupykin $ +# $Id: PKGBUILD 71544 2012-05-28 16:19:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.12 -pkgrel=3 +pkgrel=7 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -34,6 +34,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.rc.d libvirtd-guests.conf.d + libvirt.tmpfiles.d openbsd-netcat-default.patch libvirt-libnl3.patch) md5sums=('5e842bc55733ceba60c64767580ff3e4' @@ -41,6 +42,7 @@ md5sums=('5e842bc55733ceba60c64767580ff3e4' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' + '8d98e62915785686b0b6c8c070628392' 'b0be50eb9dfe4d133decf23b60880f7d' 'ba27fbcd989de8d84cfff98326f10c54') @@ -64,8 +66,8 @@ build() { export LDFLAGS=-lX11 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 - find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \; + --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ + --with-init-script=systemd make -j1 } @@ -80,5 +82,18 @@ package() { install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests - rm -rf $pkgdir/var/run + + install -dm0755 $pkgdir/usr/lib/sysctl.d + mv $pkgdir/etc/sysctl.d/libvirtd $pkgdir/usr/lib/sysctl.d/libvirtd + + # systemd stuff +# install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt +# mv $pkgdir/lib/* $pkgdir/usr/lib/ + + rm -rf \ + $pkgdir/var/run \ + $pkgdir/etc/rc.d/init.d \ + $pkgdir/etc/sysconfig \ + $pkgdir/lib \ + $pkgdir/etc/sysctl.d } |