Merge branch 'next' into arm-port

[people/teissler/ipfire-2.x.git] / lfs / kvm-kmod

diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod
index e443b703447a1dfe922c582de6e2045c5ee2103c..fad1c59ad9466867a0460757b8f0890d7ced4a8e 100644 (file)
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -34,13 +34,14 @@ else
 endif
 endif
 
-VER        = 2.6.34.1
+VER        = 3.0b
 
 THISAPP    = kvm-kmod-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules
@@ -50,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c227b58ee33f6035f16abd258bcd92ec
+$(DL_FILE)_MD5 = 19792041adc25779b31ea5c5fdca7d8c
 
 install : $(TARGET)
 
@@ -83,6 +84,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redefinition.patch
        cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && install -m 644 x86/*.ko \