openvpn: Changed chart string for DH parameter and code cleanup.

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

diff --git a/lfs/r8169 b/lfs/r8169
index 4e9f25d195f278e83ecd579cfeccfa2967854ce7..5a8be3c31e3ffe17c141996bbbd2f4d6a8b9344b 100644 (file)
--- 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) 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,23 @@
 
 include Config
 
-VER        = 6.002.00
+VERSUFIX = ipfire$(KCFG)
+ifeq "$(KCFG)" "-xen"
+       KVER = 2.6.32.61
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+       MODNAME = r8169.ko
+else
+       MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+       MODNAME = r8169.ko.vendor
+endif
+
+VER        = 6.017.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
@@ -44,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 39fdf526d45efcf99432917aab311474
+$(DL_FILE)_MD5 = 396d7e28d573bde416fbdfdef723f4bd
 
 install : $(TARGET)
 
@@ -54,6 +60,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist: 
+       $(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -73,13 +82,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @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
+       #Save original r8169 module
+ifeq "$(KCFG)" "-xen"
+       -mv $(MODPATH)/r8169.ko \
+           $(MODPATH)/r8169.ko.org
 endif
-       cd $(DIR_APP) && make
+       @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 $(MODPATH)/$(MODNAME)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
-