X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ffcdslsl;h=46fc133ad7915882fa4f8ca0924a8f7423a5a1d5;hp=3a21794c2a074913ddb680689675677001dc2fe6;hb=05207d6927b62a9e4f63b3560719a5bd4cca0e81;hpb=32fdd7d9bedf7f5f402e0a061ecad32b323cc541

diff --git a/lfs/fcdslsl b/lfs/fcdslsl
index 3a21794c2a..46fc133ad7 100644
--- a/lfs/fcdslsl
+++ b/lfs/fcdslsl
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: fcdslsl,v 1.1.2.4 2005/02/05 15:38:14 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,16 +26,17 @@
 
 include Config
 
-VER        = suse8.2-03.11.02
+VER        = suse93-3.11-07
 
 THISAPP    = fcdslsl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.avm.de/cardware/fritzcrd.dsl_sl/linux/suse.82/
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/fritz
+
 ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)
+	TARGET     = $(DIR_INFO)/$(THISAPP)
 else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
+	TARGET     = $(DIR_INFO)/$(THISAPP)-smp
 endif
 
 ###############################################################################
@@ -52,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 12d9e6780de20fcd7fbda29a4bc87897
+$(DL_FILE)_MD5 = f643737bb96d83aa57b95ced30a7d4b8
 
 install : $(TARGET)
 
@@ -82,8 +77,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/fcdslx-irqreturn.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fcdslsl-singlelock.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)/' \
@@ -91,9 +85,10 @@ ifeq "$(SMP)" ""
 	    -e 's/`uname -r`/$(KVER)/' \
 	    -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
 	    -e '\+^CCFLAGS+a\ \
-	          -include \$$(KRNLINCL)/linux/modversions.h' \
+	          -include \$$(KRNLINCL)/config/modversions.h' \
 	    -e '/^DEFINES/a\ \
-	          -DMODVERSIONS \\' src.drv/makefile
+	          -DMODVERSIONS \\' src/Makefile
+	cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)/' Makefile
 else
 	cd $(DIR_APP) && sed -i \
 	    -e 's/$$(shell uname -m)/$(MACHINE)/' \
@@ -101,21 +96,19 @@ else
 	    -e 's/`uname -r`/$(KVER)-smp/' \
 	    -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
 	    -e '\+^CCFLAGS+a\ \
-	          -include \$$(KRNLINCL)/linux/modversions.h' \
+	          -include \$$(KRNLINCL)/config/modversions.h' \
 	    -e '/^DEFINES/a\ \
-	          -DMODVERSIONS \\' src.drv/makefile
+	          -DMODVERSIONS \\' src/Makefile
+	cd $(DIR_APP) && sed -i -e 's/$$(shell uname -r)/$(KVER)-smp/' Makefile
 endif
-	cd $(DIR_APP) && CC="$(KGCC)" make
-	cd $(DIR_APP) && CC="$(KGCC)" make install
+	cd $(DIR_APP) && make CC=$(CC)
+	cd $(DIR_APP) && make CC=$(CC) install
 ifeq "$(SMP)" ""
-	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
 	-mkdir /usr/lib/isdn
 	cd $(DIR_APP) && install -m 0644 fdssbase.bin /usr/lib/isdn
 	-mkdir /etc/fcdsl
 	echo "# card          file            proto   io      irq     mem     cardnr  options"	>  /etc/fcdsl/fcdslsl.conf
 	echo "fcdslsl           fdssbase.bin    -       -       -       -       -"		>> /etc/fcdsl/fcdslsl.conf
-else
-	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
 endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)