X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fe1000e;h=693c054a7f187cbee1bf1b9fe5cdd0beb3f6f91d;hp=ba465952bda6d25478e919dc6d809a9b921a8aa2;hb=3037bccd0f73c7cdc09b66da0fcc363e5a895a1c;hpb=a0c4de46fa00a83ad5fde5c3c654b296fa012fde

diff --git a/lfs/e1000e b/lfs/e1000e
index ba465952b..693c054a7 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-2012  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,17 +24,15 @@
 
 include Config
 
-ifeq "$(PAE)" "1"
-	VERSUFIX = ipfire-pae
+VERSUFIX = ipfire$(KCFG)
+ifeq "$(KCFG)" "-xen"
+	KVER = 2.6.32.60
+	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
 else
-ifeq "$(XEN)" "1"
-	VERSUFIX = ipfire-xen
-else
-	VERSUFIX = ipfire
-endif
+	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e
 endif
 
-VER        = 1.3.10a
+VER        = 2.1.4
 
 THISAPP    = e1000e-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -50,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 04b8856433d5e582ab41bdd3b24f20a5
+$(DL_FILE)_MD5 = e8dba81bfc86c6c75f39d025fb70899f
 
 install : $(TARGET)
 
@@ -83,12 +81,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)