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 7cb846eb78878eb4120460a5d590f74b81d1077b..0280b5e69a43afc986886be355e93d0002134d15 100644 (file)
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# 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,15 +24,7 @@
 
 include Config
 
-ifeq "$(PAE)" "1"
-       VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
-       VERSUFIX=ipfire-xen
-else
-       VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
 
 VER        = 3.0b
 
@@ -41,6 +33,7 @@ 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