From 8daa43f78b7ee0f0faad99d77b566558dfdbe28d Mon Sep 17 00:00:00 2001 From: Mikhail Kolesnik Date: Tue, 24 Jul 2007 16:17:22 +0300 Subject: [PATCH] kvm: updated to 33 --- kvm/.footprint | 3 ++- kvm/.md5sum | 4 ++-- kvm/Pkgfile | 5 +++-- kvm/README | 2 +- kvm/kvm-depmod.diff | 15 +++++++-------- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/kvm/.footprint b/kvm/.footprint index b267720b2..ad0d95287 100644 --- a/kvm/.footprint +++ b/kvm/.footprint @@ -7,8 +7,9 @@ drwxr-xr-x root/root lib/modules//extra/ -rw-r--r-- root/root lib/modules//extra/kvm.ko drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/qemu +lrwxrwxrwx root/root usr/bin/qemu -> /usr/bin/qemu-system-x86_64 -rwxr-xr-x root/root usr/bin/qemu-img +-rwxr-xr-x root/root usr/bin/qemu-system-x86_64 drwxr-xr-x root/root usr/include/ -rwxr-xr-x root/root usr/include/kvmctl.h drwxr-xr-x root/root usr/include/linux/ diff --git a/kvm/.md5sum b/kvm/.md5sum index 64f7f199e..62d819f41 100644 --- a/kvm/.md5sum +++ b/kvm/.md5sum @@ -1,2 +1,2 @@ -0344ca089d2720042a6b23986b8fc81c kvm-28.tar.gz -62b1748a3a18ad60cf27911af5127ad0 kvm-depmod.diff +aafb33231101cbb6a8533baf781345bd kvm-33.tar.gz +b695f1cb3c753903839a79ae0dc0b0e7 kvm-depmod.diff diff --git a/kvm/Pkgfile b/kvm/Pkgfile index 9fcaa378a..263bdd982 100644 --- a/kvm/Pkgfile +++ b/kvm/Pkgfile @@ -4,10 +4,10 @@ # Depends on: gcc34 name=kvm -version=28 +version=33 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz - $name-depmod.diff) + $name-depmod.diff) build () { cd $name-$version @@ -15,4 +15,5 @@ build () { ./configure --prefix=/usr make make DESTDIR=$PKG install + ln -s /usr/bin/qemu-system-x86_64 $PKG/usr/bin/qemu } diff --git a/kvm/README b/kvm/README index 5aeb8a40a..2ca60d5c1 100644 --- a/kvm/README +++ b/kvm/README @@ -13,5 +13,5 @@ Update modules dependencies: RESOURCES PRECAUTION -This port installs kvm binary as /usr/bin/qemu. This would give a file +This port installs symbolik link to kvm binary as /usr/bin/qemu. This would give a file conflict with (at least) opt/qemu-bin. diff --git a/kvm/kvm-depmod.diff b/kvm/kvm-depmod.diff index 169b8bceb..b7f2821c8 100644 --- a/kvm/kvm-depmod.diff +++ b/kvm/kvm-depmod.diff @@ -1,12 +1,11 @@ -diff -Nru kvm-20-orig/kernel/Makefile kvm-20/kernel/Makefile ---- kvm-20-orig/kernel/Makefile 2007-04-25 14:34:35.000000000 +0300 -+++ kvm-20/kernel/Makefile 2007-04-25 14:40:45.000000000 +0300 -@@ -33,7 +33,7 @@ - install: - mkdir -p $(DESTDIR)/$(INSTALLDIR) - cp *.ko $(DESTDIR)/$(INSTALLDIR) +diff -Nru kvm-31-orig/kernel/Makefile kvm-31/kernel/Makefile +--- kvm-31-orig/kernel/Makefile 2007-07-19 17:43:11.000000000 +0300 ++++ kvm-31/kernel/Makefile 2007-07-24 15:46:52.467788741 +0300 +@@ -44,7 +44,6 @@ + for i in $(ORIGMODDIR)/drivers/kvm/*.ko; do \ + if [ -f "$$i" ]; then mv "$$i" "$$i.orig"; fi; \ + done - /sbin/depmod -a -+#/sbin/depmod -a tmpspec = .tmp.kvm-kmod.spec RPMDIR = $$(pwd)/../RPMS