Merge remote-tracking branch 'origin/kernel-update' into glibc-update2

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

diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod
index 2b0e24eee30f2fc4e078902234e20e6daf1ea082..0280b5e69a43afc986886be355e93d0002134d15 100644 (file)
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,19 +24,16 @@
 
 include Config
 
-ifeq "$(XEN)" "1"
-       VERSUFIX=ipfire-xen
-else
-       VERSUFIX=ipfire
-endif
+VERSUFIX=ipfire$(KCFG)
 
-VER        = 2.6.33
+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
@@ -46,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 814ab17655bc0db909246677d3d68f81
+$(DL_FILE)_MD5 = 19792041adc25779b31ea5c5fdca7d8c
 
 install : $(TARGET)
 
@@ -79,6 +76,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 \