2009/devel/kernel/pae/drivers/module-pae-kvm - Bump to the latest version.

Ozan Çağlayan paketler-commits at pardus.org.tr
Fri Dec 11 14:06:08 EET 2009


Author: ozan.caglayan
Date: Fri Dec 11 14:06:06 2009
New Revision: 82495

Removed:
   2009/devel/kernel/pae/drivers/module-pae-kvm/files/linux-2.6-kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-le-0.patch
   2009/devel/kernel/pae/drivers/module-pae-kvm/files/linux-2.6.git-6a54435560efdab1a08f429a954df4d6c740bddf.patch
Modified:
   2009/devel/kernel/pae/drivers/module-pae-kvm/   (props changed)
   2009/devel/kernel/pae/drivers/module-pae-kvm/actions.py
   2009/devel/kernel/pae/drivers/module-pae-kvm/files/60-kvm.rules
   2009/devel/kernel/pae/drivers/module-pae-kvm/files/kvm-nodepmod.patch
   2009/devel/kernel/pae/drivers/module-pae-kvm/files/kvm.git-e42d9b8141d1f54ff72ad3850bb110c95a5f3b88.patch
   2009/devel/kernel/pae/drivers/module-pae-kvm/pspec.xml
Log:
Bump to the latest version.

---
 actions.py                                                                        |    5 
 files/60-kvm.rules                                                                |    2 
 files/kvm-nodepmod.patch                                                          |   17 +--
 files/kvm.git-e42d9b8141d1f54ff72ad3850bb110c95a5f3b88.patch                      |    8 -
 files/linux-2.6-kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-le-0.patch |   55 ----------
 files/linux-2.6.git-6a54435560efdab1a08f429a954df4d6c740bddf.patch                |   31 -----
 pspec.xml                                                                         |   21 ++-
 7 files changed, 32 insertions(+), 107 deletions(-)

Modified: 2009/devel/kernel/pae/drivers/module-pae-kvm/actions.py
=================================================================
--- 2009/devel/kernel/pae/drivers/module-pae-kvm/actions.py	(original)
+++ 2009/devel/kernel/pae/drivers/module-pae-kvm/actions.py	Fri Dec 11 14:06:06 2009
@@ -11,7 +11,7 @@
 from pisi.actionsapi import get
 
 NoStrip=["/usr/share/kvm"]
-WorkDir='kvm-kmod-devel-85'
+WorkDir="kvm-kmod-%s" % get.srcVERSION()
 
 def setup():
     autotools.rawConfigure('--arch=x86 \
@@ -23,4 +23,7 @@
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
+    # FIXME: Remove internal rules for now, they're more bleeding-edge oriented
+    pisitools.removeDir("/etc/udev/rules.d")
+
 

Modified: 2009/devel/kernel/pae/drivers/module-pae-kvm/files/60-kvm.rules
=================================================================
--- 2009/devel/kernel/pae/drivers/module-pae-kvm/files/60-kvm.rules	(original)
+++ 2009/devel/kernel/pae/drivers/module-pae-kvm/files/60-kvm.rules	Fri Dec 11 14:06:06 2009
@@ -1,2 +1,2 @@
 KERNEL=="kvm*", NAME="%k", MODE="0660", GROUP="virt"
-ACTION=="add|change", SUBSYSTEM=="dmi", KERNEL=="id", RUN+="/bin/sh -c 'grep -q vmx /proc/cpuinfo && /sbin/modprobe --allow-unsupported-modules kvm-intel; grep -q svm /proc/cpuinfo && /sbin/modprobe --allow-unsupported-modules kvm-amd'"
+ACTION=="add|change", SUBSYSTEM=="dmi", KERNEL=="id", RUN+="/bin/sh -c 'grep -q vmx /proc/cpuinfo && /sbin/modprobe kvm-intel; grep -q svm /proc/cpuinfo && /sbin/modprobe kvm-amd'"

Modified: 2009/devel/kernel/pae/drivers/module-pae-kvm/files/kvm-nodepmod.patch
=================================================================
--- 2009/devel/kernel/pae/drivers/module-pae-kvm/files/kvm-nodepmod.patch	(original)
+++ 2009/devel/kernel/pae/drivers/module-pae-kvm/files/kvm-nodepmod.patch	Fri Dec 11 14:06:06 2009
@@ -1,15 +1,16 @@
-diff -Nur kvm-82.orig/kernel/Makefile kvm-82/kernel/Makefile
---- Makefile	2009-01-11 01:09:39.000000000 +0200
-+++ Makefile	2009-01-11 01:11:53.000000000 +0200
-@@ -103,11 +103,6 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -44,11 +44,6 @@ sync:
  install:
  	mkdir -p $(DESTDIR)/$(INSTALLDIR)
  	cp $(ARCH_DIR)/*.ko $(DESTDIR)/$(INSTALLDIR)
--	for i in $(ORIGMODDIR)/drivers/kvm/*.ko \
--		 $(ORIGMODDIR)/arch/$(ARCH_DIR)/kvm/*.ko; do \
+-	for i in $(DESTDIR)/$(ORIGMODDIR)/drivers/kvm/*.ko \
+-		 $(DESTDIR)/$(ORIGMODDIR)/arch/$(ARCH_DIR)/kvm/*.ko; do \
 -		if [ -f "$$i" ]; then mv "$$i" "$$i.orig"; fi; \
 -	done
--	/sbin/depmod -a $(DEPMOD_VERSION)
+-	/sbin/depmod -a $(DEPMOD_VERSION) -b $(DESTDIR)
+ 	install -m 644 -D scripts/65-kvm.rules $(DESTDIR)/etc/udev/rules.d/65-kvm.rules
  
  tmpspec = .tmp.kvm-kmod.spec
- 

Modified: 2009/devel/kernel/pae/drivers/module-pae-kvm/files/kvm.git-e42d9b8141d1f54ff72ad3850bb110c95a5f3b88.patch
=================================================================
--- 2009/devel/kernel/pae/drivers/module-pae-kvm/files/kvm.git-e42d9b8141d1f54ff72ad3850bb110c95a5f3b88.patch	(original)
+++ 2009/devel/kernel/pae/drivers/module-pae-kvm/files/kvm.git-e42d9b8141d1f54ff72ad3850bb110c95a5f3b88.patch	Fri Dec 11 14:06:06 2009
@@ -16,8 +16,8 @@
 
 diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
 index b7ed2c4..7c18e12 100644
---- a/include/asm-x86/kvm_x86_emulate.h
-+++ b/include/asm-x86/kvm_x86_emulate.h
+--- a/include/asm-x86/kvm_emulate.h
++++ b/include/asm-x86/kvm_emulate.h
 @@ -129,7 +129,7 @@ struct decode_cache {
  	u8 seg_override;
  	unsigned int d;
@@ -29,8 +29,8 @@
  	u8 modrm_mod;
 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
 index d226dff..7e8faea 100644
---- a/x86/x86_emulate.c
-+++ b/x86/x86_emulate.c
+--- a/x86/emulate.c
++++ b/x86/emulate.c
 @@ -622,6 +622,9 @@ static int do_insn_fetch(struct x86_emulate_ctxt *ctxt,
  {
  	int rc = 0;

Modified: 2009/devel/kernel/pae/drivers/module-pae-kvm/pspec.xml
=================================================================
--- 2009/devel/kernel/pae/drivers/module-pae-kvm/pspec.xml	(original)
+++ 2009/devel/kernel/pae/drivers/module-pae-kvm/pspec.xml	Fri Dec 11 14:06:06 2009
@@ -12,23 +12,23 @@
         <IsA>app:console</IsA>
         <Summary>Kernel module for Kernel-based Virtual Machine</Summary>
         <Description>KVM (for Kernel-based Virtual Machine) is a full virtualization solution for Linux on x86 hardware containing virtualization extensions (Intel VT or AMD-V). This package includes the kernel modules needed to use KVM.</Description>
-        <Archive sha1sum="ff5ac54eb6865d5d0287c687def8049e527eadf3" type="targz">mirrors://sourceforge/kvm/kvm-kmod-devel-85.tar.gz</Archive>
+        <Archive sha1sum="02a4a35ba37d2a66dda06f534c64268a60843bcb" type="tarbz2">mirrors://sourceforge/kvm/2.6.32/kvm-kmod-2.6.32.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency release="128">kernel-module-headers-pae</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch>kvm-kernel-cpuid4.patch</Patch>
             <Patch>kvm-kernel-msr.patch</Patch>
+
             <!-- no need to depmod -->
             <Patch>kvm-nodepmod.patch</Patch>
+
             <!-- Init kernel module on demand-->
             <Patch>kvm-preXX-init-on-demand.patch</Patch>
-            <!-- http://bugs.pardus.org.tr/show_bug.cgi?id=10771 -->
-            <Patch level="1">kvm-84-check-bogus-cr3-after-set-sregs.diff</Patch>
-            <!-- http://bugs.pardus.org.tr/show_bug.cgi?id=11210 -->
-            <Patch level="1">linux-2.6-kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-le-0.patch</Patch>
-            <!-- http://bugs.pardus.org.tr/show_bug.cgi?id=11427 -->
-            <Patch level="1">linux-2.6.git-6a54435560efdab1a08f429a954df4d6c740bddf.patch</Patch>
+
+            <!-- http://bugs.pardus.org.tr/show_bug.cgi?id=10771
+                 FIXME: Codebase changed a lot but this one should be fixed..
+            <Patch level="1">kvm-84-check-bogus-cr3-after-set-sregs.diff</Patch>-->
 
             <!-- KVM: x86 emulator: Limit instructions to 15 bytes (CVE-2009-4031) (#11640) -->
             <Patch level="1">kvm.git-e42d9b8141d1f54ff72ad3850bb110c95a5f3b88.patch</Patch>
@@ -47,6 +47,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2009-12-11</Date>
+            <Version>2.6.32</Version>
+            <Comment>Bump to the latest version.</Comment>
+            <Name>Ozan Çağlayan</Name>
+            <Email>ozan at pardus.org.tr</Email>
+        </Update>
         <Update release="7" type="security">
             <Date>2009-12-04</Date>
             <Version>85</Version>


More information about the paketler-commits mailing list