X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Ffcpci;h=bc27f2707d795840f738027ef9f1da0a46c8ecc4;hb=6be4dd24043dc331a2ffda3b40a7cf150d1f8f0a;hp=a58a2a03192652a1f45ca0993a2ba75bb9011e33;hpb=6ca65b88c31df11a9b1e20aaaf0a6c23fc9b5054;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/fcpci b/lfs/fcpci
index a58a2a0319..bc27f2707d 100644
--- a/lfs/fcpci
+++ b/lfs/fcpci
@@ -26,11 +26,11 @@
 
 include Config
 
-VER        = suse8.2-03.11.02
+VER        = suse93-3.11-07
 
 THISAPP    = fcpci-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.82
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/fritz
 ifeq "$(SMP)" ""
   TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 70821234398c08b1ec09fce16e2bac40
+$(DL_FILE)_MD5 = 3ee301b5d0e8df9e4b915af58b725556
 
 install : $(TARGET)
 
@@ -56,9 +56,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#	make-packages.sh fcpci $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -79,34 +76,33 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP)/src.drv && patch -Np1 < $(DIR_SRC)/src/patches/fcpci-suse8.2-03.11.02-compiler.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/fritz-dsl-gcc-4-fix.patch
 ifeq "$(SMP)" ""
 	cd $(DIR_APP) && sed -i \
 	    -e 's/$$(shell uname -m)/$(MACHINE)/' \
-	    -e 's/$$(shell uname -r)/$(KVER)/' \
-	    -e 's/`uname -r`/$(KVER)/' \
+	    -e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
+	    -e 's/`uname -r`/$(KVER)-ipfire/' \
 	    -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
 	    -e '\+^CCFLAGS+a\ \
 	          -include \$$(KRNLINCL)/linux/modversions.h' \
 	    -e '/^DEFINES/a\ \
-	          -DMODVERSIONS \\' src.drv/makefile
+	          -DMODVERSIONS \\' src/Makefile
+	cd $(DIR_APP) && sed -i \
+	    -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
 else
 	cd $(DIR_APP) && sed -i \
 	    -e 's/$$(shell uname -m)/$(MACHINE)/' \
-	    -e 's/$$(shell uname -r)/$(KVER)-smp/' \
-	    -e 's/`uname -r`/$(KVER)-smp/' \
+	    -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
+	    -e 's/`uname -r`/$(KVER)-ipfire-smp/' \
 	    -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
 	    -e '\+^CCFLAGS+a\ \
 	          -include \$$(KRNLINCL)/linux/modversions.h' \
 	    -e '/^DEFINES/a\ \
-	          -DMODVERSIONS \\' src.drv/makefile
+	          -DMODVERSIONS \\' src/Makefile
+	cd $(DIR_APP) && sed -i \
+	    -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
 endif
 	cd $(DIR_APP) && CC="$(KGCC)" make
 	cd $(DIR_APP) && CC="$(KGCC)" make install
-ifeq "$(SMP)" ""
-	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
-else
-	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
-endif
-#	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
\ No newline at end of file
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)