X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fe1000;h=d9ae7c63f8c0cc63b3ab7946e0097b67e32bf67b;hb=62ff8d9627a6dfe242b9b628df05a5eaeea88e47;hp=c7c56548e0116e233315245a179e787db4d1e578;hpb=5111b6c08b568300c50cb3079ed7d8b6976e17e1;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/e1000 b/lfs/e1000
index c7c56548e..d9ae7c63f 100644
--- a/lfs/e1000
+++ b/lfs/e1000
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  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,13 +24,15 @@
 
 include Config
 
-ifeq "$(XEN)" "1"
-	VERSUFIX = ipfire-xen
-else
-	VERSUFIX = ipfire
-endif
+VERSUFIX = ipfire$(KCFG)
 
-VER        = 8.0.19
+# e1000 vendor modul is only for legacy xen kernel
+# The 3.2.x kernel has newer module.
+
+KVER = 2.6.32.61
+MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000/
+
+VER        = 8.0.35
 
 THISAPP    = e1000-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -46,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dc66dcbfd7c2e48af8cfc86f4f174fce
+$(DL_FILE)_MD5 = 0f452b979f7a7b9ea0b5a87a117f7408
 
 install : $(TARGET)
 
@@ -79,12 +81,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	#Save original e1000 module
-	-mv /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000/e1000.ko \
-	    /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000/e1000.ko.org
+	-mv $(MODPATH)/e1000.ko \
+	    $(MODPATH)/e1000.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 e1000.ko \
-		/lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000
+	cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX)
+	cd $(DIR_APP)/src && install -m 644 e1000.ko $(MODPATH)
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)