[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fffb777ee6f9c62f29966677045a6bdc
From:       git () ipfire ! org (Arne Fitzenreiter)
Date:       2014-02-21 8:50:10
Message-ID: 20140221085016.F1E9620838 () argus ! ipfire ! org
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  fffb777ee6f9c62f29966677045a6bdc705aece0 (commit)
      from  1b8327f50e2d4daf7860bc39a864c1bdeea0a4ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fffb777ee6f9c62f29966677045a6bdc705aece0
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date:   Fri Feb 21 09:48:33 2014 +0100

    Intel-lan: updated e1000 and igb vendor driver.
    
    igb v5.0.6 and e1000e v2.5.4

-----------------------------------------------------------------------

Summary of changes:
 lfs/e1000e | 13 ++++---------
 lfs/igb    | 15 +++++----------
 make.sh    |  8 ++++----
 3 files changed, 13 insertions(+), 23 deletions(-)

Difference in files:
diff --git a/lfs/e1000e b/lfs/e1000e
index 04765a0..58c99c4 100644
--- a/lfs/e1000e
+++ b/lfs/e1000e
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team <info at ipfire.org>                      #
+# Copyright (C) 2007-2014  IPFire Team <info at 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,14 +25,9 @@
 include Config
 
 VERSUFIX = ipfire$(KCFG)
-ifeq "$(KCFG)" "-xen"
-	KVER = 2.6.32.61
-	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
-else
-	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e
-endif
+MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
 
-VER        = 2.4.14
+VER        = 2.5.4
 
 THISAPP    = e1000e-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 05bae01409bb699f14297d726df2aa23
+$(DL_FILE)_MD5 = 8a57fc73335bf1ab0e16a02ecccdae76
 
 install : $(TARGET)
 
diff --git a/lfs/igb b/lfs/igb
index a7c136a..9303ffb 100644
--- a/lfs/igb
+++ b/lfs/igb
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team <info at ipfire.org>                      #
+# Copyright (C) 2007-2014  IPFire Team <info at 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,14 +25,9 @@
 include Config
 
 VERSUFIX   = ipfire$(KCFG)
-ifeq "$(KCFG)" "-xen"
-	KVER = 2.6.32.61
-	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/igb/
-else
-	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/
-endif
+MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/
 
-VER        = 4.3.0
+VER        = 5.0.6
 
 THISAPP    = igb-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dcbf7271c016bdb71102eb623b807f83
+$(DL_FILE)_MD5 = 701717fbbba6065af4ff5138bd3a3a9c
 
 install : $(TARGET)
 
@@ -82,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	#Save original igb module
 	-mv $(MODPATH)/igb.ko \
-	    $(MODPATH)//igb.ko.org
+	    $(MODPATH)/igb.ko.org
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX)
 	cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH)
diff --git a/make.sh b/make.sh
index fc1d9c8..74c02a7 100755
--- a/make.sh
+++ b/make.sh
@@ -411,8 +411,8 @@ buildipfire() {
 #    ipfiremake r8169			KCFG="-pae"
 #    ipfiremake r8168			KCFG="-pae"
 #    ipfiremake r8101			KCFG="-pae"
-#    ipfiremake e1000e			KCFG="-pae"
-#    ipfiremake igb			KCFG="-pae"
+    ipfiremake e1000e			KCFG="-pae"
+    ipfiremake igb			KCFG="-pae"
 
     # x86 kernel build
     ipfiremake linux			KCFG=""
@@ -424,8 +424,8 @@ buildipfire() {
 #    ipfiremake r8169			KCFG=""
 #    ipfiremake r8168			KCFG=""
 #    ipfiremake r8101			KCFG=""
-#    ipfiremake e1000e			KCFG=""
-#    ipfiremake igb			KCFG=""
+    ipfiremake e1000e			KCFG=""
+    ipfiremake igb			KCFG=""
 
   else
     # arm-rpi (Raspberry Pi) kernel build


hooks/post-receive
--
IPFire 2.x development tree

[prev in list] [next in list] [prev in thread] [next in thread]