X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fr8101;h=8f92a762e13900ab5dca01145a3eac64716d5946;hb=e5db8f6fbba4715dc17cc1e3385cd47dcaa2cbd6;hp=6b582506b5ab6af2eb3eaae02bbef2f6ac57c92e;hpb=7d7238bee3b8320cfc2f3a12e11c2fc82f53650e;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/r8101 b/lfs/r8101
index 6b582506b5..8f92a762e1 100644
--- a/lfs/r8101
+++ b/lfs/r8101
@@ -30,11 +30,9 @@ else
 	VERSUFIX = ipfire
 endif
 
-VER        = 1.013.00
+VER        = ipfire-2
 
-THISAPP    = r8101-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
+THISAPP    = r8101
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
@@ -42,35 +40,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = ecf97e7870444e8c639ec5dc5b19ba30
-
 install : $(TARGET)
 
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-	$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
+check :
 
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
+download :
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+md5 :
 
 ###############################################################################
 # Installation Details
@@ -78,9 +54,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@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) && 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)
 	@$(POSTBUILD)