X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fe1000e;h=04765a09a20507ae5d980a19a4d1b90aa6c09c02;hp=79e50977cc3cd9cd08be18a4f5c9acc2abd13aca;hb=2c5bb6037f5eb29bc71580f6937dac570ec6a919;hpb=f4aa9e17f26d0d97b804db456638a8bd9a549a04

diff --git a/lfs/e1000e b/lfs/e1000e
index 79e50977cc..04765a09a2 100644
--- a/lfs/e1000e
+++ b/lfs/e1000e
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  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,13 +24,15 @@
 
 include Config
 
-ifeq "$(XEN)" "1"
-	VERSUFIX = ipfire-xen
+VERSUFIX = ipfire$(KCFG)
+ifeq "$(KCFG)" "-xen"
+	KVER = 2.6.32.61
+	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
 else
-	VERSUFIX = ipfire
+	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e
 endif
 
-VER        = 1.0.2.5
+VER        = 2.4.14
 
 THISAPP    = e1000e-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -46,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 734f171db3208285d1492401bd185aa0
+$(DL_FILE)_MD5 = 05bae01409bb699f14297d726df2aa23
 
 install : $(TARGET)
 
@@ -78,10 +80,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
+	#Save original e1000e module
+	-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)