X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fe1000e;h=58c99c43c8bcff1e736c7537d12c4b97cdd48475;hp=274676131f69559820e72e7ec559d98ea1fd0c5f;hb=fffb777ee6f9c62f29966677045a6bdc705aece0;hpb=7b321c2cbe910caeb0d5887cc4f4dc15836dd473

diff --git a/lfs/e1000e b/lfs/e1000e
index 274676131..58c99c43c 100644
--- a/lfs/e1000e
+++ b/lfs/e1000e
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2014  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,24 +24,16 @@
 
 include Config
 
-ifeq "$(PAE)" "1"
-	VERSUFIX = ipfire-pae
-else
-ifeq "$(XEN)" "1"
-	VERSUFIX = ipfire-xen
-else
-	VERSUFIX = ipfire
-endif
-endif
+VERSUFIX = ipfire$(KCFG)
+MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
 
-VER        = 1.3.10a
+VER        = 2.5.4
 
 THISAPP    = e1000e-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
-SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules
@@ -51,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 04b8856433d5e582ab41bdd3b24f20a5
+$(DL_FILE)_MD5 = 8a57fc73335bf1ab0e16a02ecccdae76
 
 install : $(TARGET)
 
@@ -84,12 +76,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	#Save original e1000e module
-	-mv /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e/e1000e.ko \
-	    /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e/e1000e.ko.org
+	-mv $(MODPATH)/e1000e.ko \
+	    $(MODPATH)/e1000e.ko.org
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ \
-		SUBDIRS=$(DIR_APP)/src modules
-	cd $(DIR_APP)/src && install -m 644 e1000e.ko \
-		/lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
+	cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX)
+	cd $(DIR_APP)/src && install -m 644 e1000e.ko $(MODPATH)
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)