diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
commit | f24ad15758f8eebcc46cb0c210f888491869d3f0 (patch) | |
tree | 85c74dd33e056502de7a306161d28f5b15b274c2 /community/libvirt | |
parent | 5f4568c7f7ba204bc047d2c74a5721f23024b339 (diff) | |
parent | 636ce8849a9c82c1787c2919ffcfe6685cb799d3 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/darkstat/PKGBUILD
community/dbmail/PKGBUILD
community/dvdisaster/PKGBUILD
community/epic4/PKGBUILD
community/fb-client/PKGBUILD
community/fcrackzip/PKGBUILD
community/fdupes/PKGBUILD
community/flobopuyo/PKGBUILD
community/intel-tbb/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/sunpinyin/PKGBUILD
community/tinc/PKGBUILD
community/uudeview/PKGBUILD
community/zathura/PKGBUILD
core/libedit/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/openssl/PKGBUILD
core/util-linux/PKGBUILD
extra/lua/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/openssl/PKGBUILD
testing/sudo/PKGBUILD
testing/udev/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'community/libvirt')
-rw-r--r-- | community/libvirt/PKGBUILD | 10 | ||||
-rwxr-xr-x | community/libvirt/libvirtd-guests.rc.d | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 30a5848a3..f0269c451 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67039 2012-03-03 14:31:16Z giovanni $ +# $Id: PKGBUILD 67806 2012-03-14 13:44:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.10 -pkgrel=2 +pkgrel=4 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -40,7 +40,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" md5sums=('a424bb793521e637349da47e93dd5fff' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - '737ec24aa56871fbabfa892789457db4' + '4091cf082b1b743f5e7af060b3760276' 'bc2971dacdbac967fc3474e50affc345' 'b0be50eb9dfe4d133decf23b60880f7d' 'db95aecdf2ccf3693fef5821cdcb7eba' @@ -63,10 +63,8 @@ build() { [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch - # fixes for yajl 2.0 API changes -# [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch" - 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#' {} \; diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d index b4331964a..e07478534 100755 --- a/community/libvirt/libvirtd-guests.rc.d +++ b/community/libvirt/libvirtd-guests.rc.d @@ -41,7 +41,7 @@ libvirt_shutdown() sleep 1 timeout=$((timeout - 1)) state=`libvirt_get_guest_state "$1"` - [ "x$state" != "xshut" ] && return 0 + [ "x$state" == "xshut" ] && return 0 done return 1 } |