]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 85f029d)
intel-lan: update intel lan driver.
authorArne Fitzenreiter <arne_f@git.ipfire.org>
Sun, 14 Oct 2012 12:25:48 +0000 (14:25 +0200)
committerArne Fitzenreiter <arne_f@git.ipfire.org>
Sun, 14 Oct 2012 12:25:48 +0000 (14:25 +0200)
lfs/e1000 patch | blob | blame | history
lfs/e1000e patch | blob | blame | history
lfs/igb patch | blob | blame | history
make.sh patch | blob | blame | history

diff --git a/lfs/e1000 b/lfs/e1000
index fe31df733dc35c1976f1438911556bfe80e4e0ad..25abe4538f7c6411484780a465b778ccdaa80b90 100644 (file)
--- a/lfs/e1000
+++ b/lfs/e1000
@@ -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        #
@@ -26,6 +26,12 @@ include Config
 
 VERSUFIX = ipfire$(KCFG)
 
+# e1000 vendor modul is only for legacy xen kernel
+# The 3.2.x kernel has newer module.
+
+KVER = 2.6.32.60
+MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000/
+
 VER        = 8.0.35
 
 THISAPP    = e1000-$(VER)
@@ -75,12 +81,11 @@ $(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 && install -m 644 e1000.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/e1000e b/lfs/e1000e
index f046ee516c99e7795df86b910f736690050a63bf..42f26380331d6e6f4e11c217bc22331f798b8f0d 100644 (file)
--- 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        #
@@ -25,8 +25,14 @@
 include Config
 
 VERSUFIX = ipfire$(KCFG)
+ifeq "$(KCFG)" "-xen"
+       KVER = 2.6.32.60
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e
+endif
 
-VER        = 1.6.3
+VER        = 2.1.4
 
 THISAPP    = e1000e-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9526a6c004f936506a90e10911420bf8
+$(DL_FILE)_MD5 = e8dba81bfc86c6c75f39d025fb70899f
 
 install : $(TARGET)
 
@@ -75,12 +81,11 @@ $(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 && install -m 644 e1000e.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/igb b/lfs/igb
index ce7f8ad10e46a458072d4f89dcda92f6e7ad7dce..2931881490459a7bb35580ef87240674557abc80 100644 (file)
--- a/lfs/igb
+++ b/lfs/igb
@@ -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        #
@@ -25,8 +25,14 @@
 include Config
 
 VERSUFIX   = ipfire$(KCFG)
+ifeq "$(KCFG)" "-xen"
+       KVER = 2.6.32.60
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/igb/
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/
+endif
 
-VER        = 3.2.10
+VER        = 3.4.8
 
 THISAPP    = igb-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 22d09e7f7c8f0b23f744914e41c7ce43
+$(DL_FILE)_MD5 = 36bd0eface2761577f52d84d5c5b78ea
 
 install : $(TARGET)
 
@@ -75,12 +81,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        #Save original igb module
-       -mv /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/igb/igb.ko \
-           /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/igb/igb.ko.org
+       -mv $(MODPATH)/igb.ko \
+           $(MODPATH)//igb.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 igb.ko \
-               /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/igb
+       cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 2a5809c25bc3661d571e3b88659d0581c4436740..d3a7a8326e4b30aa0a92773406e582a68652a131 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -386,9 +386,9 @@ buildipfire() {
     ipfiremake r8169                   KCFG="-xen"
     ipfiremake r8168                   KCFG="-xen"
     ipfiremake r8101                   KCFG="-xen"
-#    ipfiremake e1000                  KCFG="-xen"
-#    ipfiremake e1000e                 KCFG="-xen"
-#    ipfiremake igb                    KCFG="-xen"
+    ipfiremake e1000                   KCFG="-xen"
+    ipfiremake e1000e                  KCFG="-xen"
+    ipfiremake igb                     KCFG="-xen"
 
     ipfiremake linux                   KCFG="-pae"
 #    ipfiremake kvm-kmod                       KCFG="-pae"
@@ -400,9 +400,8 @@ buildipfire() {
     ipfiremake r8169                   KCFG="-pae"
     ipfiremake r8168                   KCFG="-pae"
     ipfiremake r8101                   KCFG="-pae"
-#    ipfiremake e1000                  KCFG="-pae"
-#    ipfiremake e1000e                 KCFG="-pae"
-#    ipfiremake igb                    KCFG="-pae"
+    ipfiremake e1000e                  KCFG="-pae"
+    ipfiremake igb                     KCFG="-pae"
 
     ipfiremake linux                   KCFG=""
 #    ipfiremake kvm-kmod                       KCFG=""
@@ -414,9 +413,8 @@ buildipfire() {
     ipfiremake r8169                   KCFG=""
     ipfiremake r8168                   KCFG=""
     ipfiremake r8101                   KCFG=""
-#    ipfiremake e1000                  KCFG=""
-#    ipfiremake e1000e                 KCFG=""
-#    ipfiremake igb                    KCFG=""
+    ipfiremake e1000e                  KCFG=""
+    ipfiremake igb                     KCFG=""
 
   else
     # arm-omap kernel build
Timo's tree of IPFire 2.x