X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fr8101;h=a523c68dd0244f1a41dd1c363afbaa9387392a6f;hb=b93741f4ef58800e2e16e813bc39917d2595e191;hp=94adc03acd37261effd93bf00f2bf47de6a36ccb;hpb=7c9312c86e7a380029d1896538c6e7ab33e4ed48;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/r8101 b/lfs/r8101
index 94adc03acd..a523c68dd0 100644
--- a/lfs/r8101
+++ b/lfs/r8101
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  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,15 +24,21 @@
 
 include Config
 
+ifeq "$(PAE)" "1"
+	VERSUFIX = ipfire-pae
+else
 ifeq "$(XEN)" "1"
 	VERSUFIX = ipfire-xen
 else
 	VERSUFIX = ipfire
 endif
+endif
 
-VER        = ipfire-1
+VER        = 1.019.00
 
-THISAPP    = r8101
+THISAPP    = r8101-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
@@ -40,13 +46,35 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 2804355badc4cb14f091dd8b32d270c3
+
 install : $(TARGET)
 
-check :
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
 
-download :
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
 
-md5 :
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
 
 ###############################################################################
 # Installation Details
@@ -54,8 +82,9 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cp -r $(DIR_SRC)/src/$(THISAPP) $(DIR_APP)
-	cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP) modules
-	cd $(DIR_APP) && install -m 644 r8101.ko /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net 
+	@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 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)