Merge branch 'libsatsolver' into next

[people/teissler/ipfire-2.x.git] / lfs / e1000e

diff --git a/lfs/e1000e b/lfs/e1000e
index 79e50977cc3cd9cd08be18a4f5c9acc2abd13aca..ba465952bda6d25478e919dc6d809a9b921a8aa2 100644 (file)
--- 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-2011  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,17 @@
 
 include Config
 
+ifeq "$(PAE)" "1"
+       VERSUFIX = ipfire-pae
+else
 ifeq "$(XEN)" "1"
        VERSUFIX = ipfire-xen
 else
        VERSUFIX = ipfire
 endif
+endif
 
-VER        = 1.0.2.5
+VER        = 1.3.10a
 
 THISAPP    = e1000e-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -46,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 734f171db3208285d1492401bd185aa0
+$(DL_FILE)_MD5 = 04b8856433d5e582ab41bdd3b24f20a5
 
 install : $(TARGET)
 
@@ -78,6 +82,9 @@ $(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
        @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