]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: d9edbc1)
Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen
authorArne Fitzenreiter <arne_f@git.ipfire.org>
Sun, 14 Oct 2012 13:07:37 +0000 (15:07 +0200)
committerArne Fitzenreiter <arne_f@git.ipfire.org>
Sun, 14 Oct 2012 13:07:37 +0000 (15:07 +0200)
lfs/e1000 patch | blob | blame | history
lfs/e1000e patch | blob | blame | history
lfs/igb patch | blob | blame | history
lfs/r8101 patch | blob | blame | history
lfs/r8168 patch | blob | blame | history
lfs/r8169 patch | blob | blame | history
make.sh patch | blob | blame | history
src/patches/r8169_add_missing_pciids.patch 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/lfs/r8101 b/lfs/r8101
index 266e891bd1139eb696c1f034ac735ea0bc55a2b3..85d39007b871c65b5222adaf8dea66beed1abb1c 100644 (file)
--- a/lfs/r8101
+++ b/lfs/r8101
@@ -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
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+endif
 
-VER        = 1.019.00
+VER        = 1.023.00
 
 THISAPP    = r8101-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2804355badc4cb14f091dd8b32d270c3
+$(DL_FILE)_MD5 = 03cfc34e41522cd34ac6f4b1b6508896
 
 install : $(TARGET)
 
@@ -77,6 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8101_add_missing_pciids.patch
        cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
-       cd $(DIR_APP)/src && install -m 644 r8101.ko /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net 
+       cd $(DIR_APP)/src && install -m 644 r8101.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/r8168 b/lfs/r8168
index 2a4e2abad2ca3ff3b98e7a19be3d394bef9b4880..940172fe9aecc28db92d6a5729589542866b97ae 100644 (file)
--- a/lfs/r8168
+++ b/lfs/r8168
@@ -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
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+endif
 
-VER        = 8.019.00
+VER        = 8.032.00
 
 THISAPP    = r8168-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f6934fc5df1dfb5fea82e4a310568890
+$(DL_FILE)_MD5 = 942ce02459a181093f77bb4d5cc75d45
 
 install : $(TARGET)
 
@@ -76,6 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
-       cd $(DIR_APP)/src && install -m 644 r8168.ko /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net 
+       cd $(DIR_APP)/src && install -m 644 r8168.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/r8169 b/lfs/r8169
index 85a6dc179da666eb98a34a824ac1bfaf2c75b923..65c34e610f570061e2d57a0a3f7d9c4fe3d7aefe 100644 (file)
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -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
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+endif
 
-VER        = 6.014.00
+VER        = 6.017.00
 
 THISAPP    = r8169-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3
+$(DL_FILE)_MD5 = 396d7e28d573bde416fbdfdef723f4bd
 
 install : $(TARGET)
 
@@ -75,11 +81,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        #Save original r8169 module
-       -mv /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/r8169.ko \
-           /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/r8169.ko.org
+       -mv $(MODPATH)/r8169.ko \
+           $(MODPATH)/r8169.ko.org
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8169_add_missing_pciids.patch
        cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
-       cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net 
+       cd $(DIR_APP)/src && install -m 644 r8169.ko $(MODPATH)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 2a71bbfb73fb5ea453957abdfd4e950589fa2466..d8de79263a0656c86da3f0697805e3355bc92ee9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -383,12 +383,12 @@ buildipfire() {
     ipfiremake mISDN                   KCFG="-xen"
     ipfiremake cryptodev               KCFG="-xen"
     ipfiremake compat-wireless         KCFG="-xen"
-#    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 r8169                   KCFG="-xen"
+    ipfiremake r8168                   KCFG="-xen"
+    ipfiremake r8101                   KCFG="-xen"
+    ipfiremake e1000                   KCFG="-xen"
+    ipfiremake e1000e                  KCFG="-xen"
+    ipfiremake igb                     KCFG="-xen"
 
     ipfiremake linux                   KCFG="-pae"
 #    ipfiremake kvm-kmod                       KCFG="-pae"
@@ -397,12 +397,11 @@ buildipfire() {
     ipfiremake mISDN                   KCFG="-pae"
     ipfiremake cryptodev               KCFG="-pae"
     ipfiremake compat-wireless         KCFG="-pae"
-#    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 r8169                   KCFG="-pae"
+    ipfiremake r8168                   KCFG="-pae"
+    ipfiremake r8101                   KCFG="-pae"
+    ipfiremake e1000e                  KCFG="-pae"
+    ipfiremake igb                     KCFG="-pae"
 
     ipfiremake linux                   KCFG=""
 #    ipfiremake kvm-kmod                       KCFG=""
@@ -411,12 +410,11 @@ buildipfire() {
     ipfiremake mISDN                   KCFG=""
     ipfiremake cryptodev               KCFG=""
     ipfiremake compat-wireless         KCFG=""
-#    ipfiremake r8169                  KCFG=""
-#    ipfiremake r8168                  KCFG=""
-#    ipfiremake r8101                  KCFG=""
-#    ipfiremake e1000                  KCFG=""
-#    ipfiremake e1000e                 KCFG=""
-#    ipfiremake igb                    KCFG=""
+    ipfiremake r8169                   KCFG=""
+    ipfiremake r8168                   KCFG=""
+    ipfiremake r8101                   KCFG=""
+    ipfiremake e1000e                  KCFG=""
+    ipfiremake igb                     KCFG=""
 
   else
     # arm-omap kernel build
diff --git a/src/patches/r8169_add_missing_pciids.patch b/src/patches/r8169_add_missing_pciids.patch
index dab3af0d208fa7f919a1a7d9d2c5ec00cecc0868..86916f648838c9c04e5428d68c9236643e57873c 100644 (file)
--- a/src/patches/r8169_add_missing_pciids.patch
+++ b/src/patches/r8169_add_missing_pciids.patch
@@ -1,12 +1,14 @@
-diff -Naur r8169-6.011.00.org/src/r8169_n.c r8169-6.011.00/src/r8169_n.c
---- r8169-6.011.00.org/src/r8169_n.c   2009-07-14 08:39:25.000000000 +0200
-+++ r8169-6.011.00/src/r8169_n.c       2009-10-22 19:18:42.000000000 +0200
-@@ -114,6 +114,11 @@
+diff -Naur r8169-6.017.00.org/src/r8169_n.c r8169-6.017.00/src/r8169_n.c
+--- r8169-6.017.00.org/src/r8169_n.c   2012-05-03 14:23:12.000000000 +0200
++++ r8169-6.017.00/src/r8169_n.c       2012-10-14 12:43:52.478555777 +0200
+@@ -115,7 +115,12 @@
  static struct pci_device_id rtl8169_pci_tbl[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8167), 0, 0, RTL_CFG_0 },
        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8169), 0, 0, RTL_CFG_0 },
+-      { PCI_VENDOR_ID_DLINK, 0x4300, PCI_VENDOR_ID_DLINK, 0x4c00, 0, 0, RTL_CFG_0 },
 +      { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8129), 0, 0, RTL_CFG_0 },
 +      { PCI_DEVICE(PCI_VENDOR_ID_DLINK,       0x4300), 0, 0, RTL_CFG_0 },
++      { PCI_DEVICE(PCI_VENDOR_ID_DLINK,       0x4302), 0, 0, RTL_CFG_0 },
 +      { PCI_DEVICE(PCI_VENDOR_ID_AT,          0xC107), 0, 0, RTL_CFG_0 },
 +      { PCI_DEVICE(0x16EC,                    0x0116), 0, 0, RTL_CFG_0 },
 +      { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 },
IPFire 2.x development tree