diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-07 14:50:17 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-07 14:50:17 +0000 |
| commit | 809da337d9de8ac5edfde76f3950ef92a44579b7 (patch) | |
| tree | 35299a8fca5ea64047d7b04f691c77a60d04ef23 /testing | |
| parent | 061c336a70c3a0984a80fa9aeae8a14dbddecbd5 (diff) | |
| download | aports-809da337d9de8ac5edfde76f3950ef92a44579b7.tar.bz2 aports-809da337d9de8ac5edfde76f3950ef92a44579b7.tar.xz | |
testing/kvm: upgrade to 87
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/kvm/APKBUILD | 35 | ||||
| -rw-r--r-- | testing/kvm/kvm-82-uclibc.patch | 14 |
2 files changed, 17 insertions, 32 deletions
diff --git a/testing/kvm/APKBUILD b/testing/kvm/APKBUILD index 6ee6147209..e5034b40cb 100644 --- a/testing/kvm/APKBUILD +++ b/testing/kvm/APKBUILD @@ -1,33 +1,32 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kvm -pkgver=84 +pkgver=87 pkgrel=0 pkgdesc="kernel-based virtual machine" -url="http://kvm.qumranet.com" +url="http://www.linux-kvm.org/" license='GPL' -depends="uclibc" -makedepends="ncurses-dev" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - kvm-82-uclibc.patch - " +depends= +makedepends="ncurses-dev linux-grsec-dev pciutils-dev alsa-lib-dev curl-dev" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" subpackages="" build() { cd "$srcdir/$pkgname-$pkgver" - for i in ../*.patch; do - msg "Applying $i" - patch -p1 < $i || return 1; - done + + # lets use kernel modules from mainline kernel + rm -r kvm/kernel + + # we need -lrt linker flag for uclibc + sed -i -e 's/^LIBS+=-lz/LIBS+=-lz -lrt/' Makefile.target || return 1 ./configure --prefix=/usr \ - --disable-gfx-check \ - --disable-sdl \ - --qemu-ldflags=-nopie + --extra-ldflags=-nopie \ + --disable-nptl \ + --audio-drv-list="alsa oss" \ + --disable-sdl - make libkvm || return 1 - make qemu || return 1 + make || return 1 make DESTDIR="$pkgdir"/ kcmd="#" install } -md5sums="39b7206ef400845800f081a5b901f757 kvm-84.tar.gz -c439025cbfe89b35c2ae78aa481eb93f kvm-82-uclibc.patch" +md5sums="a03ccefb0d096f8efee2b07b56555b33 kvm-87.tar.gz" diff --git a/testing/kvm/kvm-82-uclibc.patch b/testing/kvm/kvm-82-uclibc.patch deleted file mode 100644 index 488be77d8d..0000000000 --- a/testing/kvm/kvm-82-uclibc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- kvm-82.orig/qemu/configure Wed Jan 14 13:40:28 2009 -+++ kvm-82/qemu/configure Wed Jan 14 13:41:28 2009 -@@ -1068,7 +1068,10 @@ - cat > $TMPC <<EOF - #include <signal.h> - #include <time.h> --int main(void) { clockid_t id; return clock_gettime(id, NULL); } -+int main(void) { clockid_t id; timer_t tid; -+ return clock_gettime(id, NULL) + timer_delete(tid); -+} -+ - EOF - - rt=no |