X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fkqemu;h=d07d9f1cc9771f06314bdc19e568b8ac5c7cd9cb;hb=cdefc58fc1586ccb493574d14c9ac48896f546bd;hp=cc3f46e62a5f5cd23e9a14516ea5422e56c63cc3;hpb=202f35e29c3e1c2d48df292943370487e92a671b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/kqemu b/lfs/kqemu
index cc3f46e62a..d07d9f1cc9 100644
--- a/lfs/kqemu
+++ b/lfs/kqemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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,18 +24,23 @@
 
 include Config
 
-VER        = 1.3.0pre11
+ifeq "$(PAE)" "1"
+	VERSUFIX=ipfire-pae
+else
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+endif
+
+VER        = 1.4.0pre1
 
 THISAPP    = kqemu-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-	TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-	TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
-
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 970521874ef8b1ba4598925ace5936c3
+$(DL_FILE)_MD5 = d738d8ca7332211ab716ec3213d82ee1
 
 install : $(TARGET)
 
@@ -80,16 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/usr/src/linux
 	cd $(DIR_APP) && make $(MAKETUNING)
-		
-ifeq "$(SMP)" "1"
-#	cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire-smp/build/
-#	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire-smp/misc/
-else
-#	cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire/build/
-#	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire/misc/
-endif
-	
+	-mkdir -p /lib/modules/$(KVER)-$(VERSUFIX)/misc/
+	cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-$(VERSUFIX)/misc/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)