X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fr8169;h=b738385361f5e1b1ec1eb15407c8a66e3503b85e;hp=87cc107380f517f37ee626aac78088408e845fa6;hb=0449b50f896009ad68431e2bd7b3091f5570269d;hpb=a23731d1a8c24e4fd0506967675168414623e9ba

diff --git a/lfs/r8169 b/lfs/r8169
index 87cc107380..b738385361 100644
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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        #
@@ -24,18 +24,23 @@
 
 include Config
 
-VER        = 6.005.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
@@ -45,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0004219943751f90ea996843257a00cb
+$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3
 
 install : $(TARGET)
 
@@ -77,17 +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)
-	cd $(DIR_APP) && patch -N -p1 < $(DIR_SRC)/src/patches/r8169-dlink_linksys.patch
-	
-ifeq "$(SMP)" "1"
-	cd $(DIR_APP) && make clean
-	cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP)/src modules
-	cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net 
-else
-	cd $(DIR_APP) && make clean
-	cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP)/src modules
-	cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/net 
-endif
+	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)