X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fr8169;h=5a8be3c31e3ffe17c141996bbbd2f4d6a8b9344b;hp=b738385361f5e1b1ec1eb15407c8a66e3503b85e;hb=ad5338015f68bca7bb5987c7e44218fe21377dad;hpb=514bee894cc0c0825fb874689d3e245d3fdaf1de

diff --git a/lfs/r8169 b/lfs/r8169
index b73838536..5a8be3c31 100644
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2013  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,17 +24,17 @@
 
 include Config
 
-ifeq "$(PAE)" "1"
-	VERSUFIX = ipfire-pae
+VERSUFIX = ipfire$(KCFG)
+ifeq "$(KCFG)" "-xen"
+	KVER = 2.6.32.61
+	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+	MODNAME = r8169.ko
 else
-ifeq "$(XEN)" "1"
-	VERSUFIX = ipfire-xen
-else
-	VERSUFIX = ipfire
-endif
+	MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+	MODNAME = r8169.ko.vendor
 endif
 
-VER        = 6.014.00
+VER        = 6.017.00
 
 THISAPP    = r8169-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3
+$(DL_FILE)_MD5 = 396d7e28d573bde416fbdfdef723f4bd
 
 install : $(TARGET)
 
@@ -83,11 +83,13 @@ $(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
+ifeq "$(KCFG)" "-xen"
+	-mv $(MODPATH)/r8169.ko \
+	    $(MODPATH)/r8169.ko.org
+endif
 	@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)/$(MODNAME)
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)