Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / lfs / r8169

diff --git a/lfs/r8169 b/lfs/r8169
index 4fc057289de021addc0defba005c1fc568632609..b738385361f5e1b1ec1eb15407c8a66e3503b85e 100644 (file)
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,17 +24,23 @@
 
 include Config
 
-VER        = 6.002.00
+ifeq "$(PAE)" "1"
+       VERSUFIX = ipfire-pae
+else
+ifeq "$(XEN)" "1"
+       VERSUFIX = ipfire-xen
+else
+       VERSUFIX = ipfire
+endif
+endif
+
+VER        = 6.014.00
 
 THISAPP    = r8169-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -46,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 39fdf526d45efcf99432917aab311474
+$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3
 
 install : $(TARGET)
 
@@ -56,6 +60,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist: 
+       $(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -75,13 +82,12 @@ $(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
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(SMP)" "1"
-       cd $(DIR_APP) && sed -e "s/^KVER                := \$$(shell uname -r)/KVER = $(KVER)-ipfire-smp/g" -i src/Makefile
-else
-       cd $(DIR_APP) && sed -e "s/^KVER                := \$$(shell uname -r)/KVER = $(KVER)-ipfire/g" -i src/Makefile
-endif
-       cd $(DIR_APP) && make
+       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 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
-