Zwischencommit fuer LFS.

Die Asterisk-Leute haben mal wieder zugeschlagen... Da warten wir mal auf den Junghanns, oder nehmen wir was anderes? git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@325 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-09 18:45:54 +02:00 · 2006-10-19 18:37:19 +00:00
parent fd3e7da032
commit 119f6ad356
7 changed files with 62 additions and 71 deletions
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -26,7 +26,7 @@

 include Config

-VER        = 1.2.10
+VER        = 1.2.13

 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
@@ -46,7 +46,7 @@ objects = $(DL_FILE) \
 	   apps_Makefile.patch \
 	   asterisk-sounds-de-1.2.5.tar.gz \
 	   asterisk-sounds-1.2.1.tar.gz \
-	   asterisk-addons-1.2.3.tar.gz \
+	   asterisk-addons-1.2.5.tar.gz \
 	   asterisk-perl-0.08.tar.gz

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
@@ -55,16 +55,16 @@ app_txfax.c = $(URL_IPFIRE)/app_txfax.c
 apps_Makefile.patch = $(URL_IPFIRE)/apps_Makefile.patch
 asterisk-sounds-de-1.2.5.tar.gz = $(URL_IPFIRE)/asterisk-sounds-de-1.2.5.tar.gz
 asterisk-sounds-1.2.1.tar.gz = $(URL_IPFIRE)/asterisk-sounds-1.2.1.tar.gz
-asterisk-addons-1.2.3.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.2.3.tar.gz
+asterisk-addons-1.2.5.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.2.5.tar.gz
 asterisk-perl-0.08.tar.gz = $(URL_IPFIRE)/asterisk-perl-0.08.tar.gz

-$(DL_FILE)_MD5 = ec52095bb5cfe583df1dd5f98366797a
+$(DL_FILE)_MD5 = ad8fbe2198568f55c254045ecb3b7926
 app_rxfax.c_MD5 = ab6983b51c412883545b36993d704999
 app_txfax.c_MD5 = 8c8fcb263b76897022b4c28052a7b439
 apps_Makefile.patch_MD5 = 6b0faa7a7cf8613962b17c23ee5a1583
 asterisk-sounds-1.2.1.tar.gz_MD5 = bed4259905a7d7bc070c6319142b2075
 asterisk-sounds-de-1.2.5.tar.gz_MD5 = 3793735c44de899dbacb8c192501aa14
-asterisk-addons-1.2.3.tar.gz_MD5 = 2089e119985508b5a4a1916e2242184d
+asterisk-addons-1.2.5.tar.gz_MD5 = 2bc743cb622986873b5fd5be0f013034
 asterisk-perl-0.08.tar.gz_MD5 = 73a47caaff8cafbf78053692f408ceb6

 install : $(TARGET)
@@ -98,12 +98,13 @@ $(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/asterisk.patch
-	### FAX geht noch nicht mit Asterisk 1.2.9.1
+###### We have to wait for a new bristuff ######
+###### cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/asterisk.patch
+	### FAX geht noch nicht mit Asterisk
 	# cp -fv $(DIR_DL)/app_{r,t}xfax.c $(DIR_APP)/apps && \
 	# cd $(DIR_APP)/apps && patch < $(DIR_DL)/apps_Makefile.patch
 	cd $(DIR_APP) && make clean
-	cd $(DIR_APP) && make all ASTETCDIR=/var/ipfire/asterisk
+	cd $(DIR_APP) && make $(MAKETUNING) all ASTETCDIR=/var/ipfire/asterisk
 	cd $(DIR_APP) && make install ASTETCDIR=/var/ipfire/asterisk
 	cd $(DIR_APP) && make samples ASTETCDIR=/var/ipfire/asterisk
 	tar xfz $(DIR_DL)/asterisk-sounds-de-1.2.5.tar.gz -C /var/lib/asterisk/sounds/
@@ -111,12 +112,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-sounds-1.2.1.tar.gz
 	cd $(DIR_SRC)/asterisk-sounds-1.2.1/ && make all install
 	rm -rf $(DIR_SRC)/asterisk-sounds-1.2.1
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.2.3.tar.gz
-	cd $(DIR_SRC)/asterisk-addons-1.2.3/ && make all install
-	rm -rf $(DIR_SRC)/asterisk-addons-1.2.3
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.2.5.tar.gz
+	cd $(DIR_SRC)/asterisk-addons-1.2.5/ && make $(MAKETUNING) all install
+	rm -rf $(DIR_SRC)/asterisk-addons-1.2.5
 	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-perl-0.08.tar.gz
 	cd $(DIR_SRC)/asterisk-perl-0.08/ && perl Makefile.PL
-	cd $(DIR_SRC)/asterisk-perl-0.08/ && make
+	cd $(DIR_SRC)/asterisk-perl-0.08/ && make $(MAKETUNING)
 	cd $(DIR_SRC)/asterisk-perl-0.08/ && make install
 	rm -rf $(DIR_SRC)/asterisk-perl-0.08
 	@rm -rf $(DIR_APP)
--- a/lfs/bristuff
+++ b/lfs/bristuff
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bristuff
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
@@ -84,27 +84,27 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

 	# Build uno/duo/quad GSM PCI driver
 	cd $(DIR_APP)/ztgsm && \
-	make clean linux24 && \
+	make clean linux26 && \
 	install -D -m 644 ztgsm.o /lib/modules/$(KVER)/misc/ztgsm.o

 	# Build qozap
 	cd $(DIR_APP)/qozap && \
-	make clean linux24 && \
+	make clean linux26 && \
 	install -D -m 644 qozap.o /lib/modules/$(KVER)/misc/qozap.o

 	# Build cwain
 	cd $(DIR_APP)/cwain && \
-	make clean linux24 && \
+	make clean linux26 && \
 	install -D -m 644 cwain.o /lib/modules/$(KVER)/misc/cwain.o

 	# Build zaphfc
 	cd $(DIR_APP)/zaphfc && \
 	patch -Np1 < $(DIR_SRC)/src/patches/zaphfc_0.3.0-PRE-1o_florz-12.diff && \
-	cd $(DIR_APP)/zaphfc && make clean linux24 && \
+	cd $(DIR_APP)/zaphfc && make clean linux26 && \
 	install -D -m 644 zaphfc.o /lib/modules/$(KVER)/misc/zaphfc.o

 	# Compress the Kernelmodules
-	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
-	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
+#	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
+#	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/libpri
+++ b/lfs/libpri
@@ -26,7 +26,7 @@

 include Config

-VER        = 1.2.3
+VER        = 1.2.4

 THISAPP    = libpri-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libpri
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = f365d9ee29a7253d605729a6d07ebfff
+$(DL_FILE)_MD5 = 2bc348d8363027736ccbf5998d85d317

 install : $(TARGET)

@@ -77,11 +77,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	# Build Libpri
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpri.patch
-	cd $(DIR_APP) && make clean all KVERS=$(KVER)
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpri.patch
+	cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)
 	cd $(DIR_APP) && make install KVERS=$(KVER)
-	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
-	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
+#	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
+#	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/modutils
+++ b/lfs/modutils
@@ -72,7 +72,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) && ./configure --disable-nls --enable-zlib
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/module-init-tools-3.2.2-modprobe-1.patch
+	cd $(DIR_APP) && ./configure --prefix=/ --disable-nls --enable-zlib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make INSTALL=install install
 	@rm -rf $(DIR_APP)
--- a/lfs/mpg123
+++ b/lfs/mpg123
@@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 0.59r

 THISAPP    = mpg123-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://alge.anart.no/pub/audio
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

@@ -59,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))

 dist: 
-	make-packages.sh mpg123 $(THISAPP)-ipfire-beta-1
+	@$(PAK)

 ###############################################################################
 # Downloading, checking, md5sum
@@ -82,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mpg123-0.59r-security-1.patch
-	cd $(DIR_APP) && make PREFIX=/usr linux
+	cd $(DIR_APP) && make PREFIX=/usr linux $(MAKETUNING)
 	cd $(DIR_APP) && make PREFIX=/usr install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/zaptel
+++ b/lfs/zaptel
@@ -26,15 +26,19 @@

 include Config

-VER        = 1.2.7
+VER        = 1.2.10

 THISAPP    = zaptel-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(PASS)" "SMP"
+	TARGET     = $(DIR_INFO)/$(THISAPP)-smp
+else
+	TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 PROG       = zaptel
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
@@ -44,7 +48,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 5134f361d92e5ec7342d7e80bad7d30a
+$(DL_FILE)_MD5 = 25f9a78272104efdbd44261e33edb725

 install : $(TARGET)

@@ -79,33 +83,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	# Build Zaptel
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zaptel.patch
-	cd $(DIR_APP) && make clean
-	cd $(DIR_APP) && make all KVERS=$(KVER)-smp
+ifeq "$(PASS)" "SMP"
+	cd $(DIR_APP) && make $(MAKETUNING) linux26 KVERS=$(KVER)-smp
 	cd $(DIR_APP) && make install KVERS=$(KVER)-smp
-	cd $(DIR_APP) && make clean
-	cd $(DIR_APP) && make all KVERS=$(KVER)
+else
+	cd $(DIR_APP) && make $(MAKETUNING) linux26 KVERS=$(KVER)
 	cd $(DIR_APP) && make install KVERS=$(KVER)
-	cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/linux/zaptel.h
-	cd $(DIR_APP) && install -D -m 644 zconfig.h /usr/include/linux/zconfig.h
-	cd $(DIR_APP) && install -D -m 644 ecdis.h /usr/include/linux/ecdis.h
-	cd $(DIR_APP) && install -D -m 644 fasthdlc.h /usr/include/linux/fasthdlc.h
-	cd $(DIR_APP) && install -D -m 644 kb1ec.h /usr/include/linux/kb1ec.h
-	cd $(DIR_APP) && install -D -m 644 kb1ec_const.h /usr/include/linux/kb1ec_const.h
-	cd $(DIR_APP) && install -D -m 644 biquad.h /usr/include/linux/biquad.h
-	cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/linux/arith.h
-	cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/linux/mg2ec.h
-	cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/linux/mg2ec_const.h
-	ln -nf -v /usr/include/linux/zaptel.h /usr/include/zaptel.h
-	ln -nf -v /usr/include/linux/zconfig.h /usr/include/zconfig.h
-	ln -nf -v /usr/include/linux/ecdis.h /usr/include/ecdis.h
-	ln -nf -v /usr/include/linux/fasthdlc.h /usr/include/fasthdlc.h
-	ln -nf -v /usr/include/linux/kb1ec.h /usr/include/kb1ec.h
-	ln -nf -v /usr/include/linux/kb1ec_const.h /usr/include/kb1ec_const.h
-	ln -nf -v /usr/include/linux/biquad.h /usr/include/biquad.h
-	ln -nf -v /usr/include/linux/arith.h /usr/include/arith.h
-	ln -nf -v /usr/include/linux/mg2ec.h /usr/include/mg2ec.h
-	ln -nf -v /usr/include/linux/mg2ec_const.h /usr/include/mg2ec_const.h
-	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
-	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
+endif
+	cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/zaptel.h
+	cd $(DIR_APP) && install -D -m 644 zconfig.h /usr/include/zconfig.h
+	cd $(DIR_APP) && install -D -m 644 ecdis.h /usr/include/ecdis.h
+	cd $(DIR_APP) && install -D -m 644 fasthdlc.h /usr/include/fasthdlc.h
+	cd $(DIR_APP) && install -D -m 644 kb1ec.h /usr/include/kb1ec.h
+	cd $(DIR_APP) && install -D -m 644 kb1ec_const.h /usr/include/kb1ec_const.h
+	cd $(DIR_APP) && install -D -m 644 biquad.h /usr/include/biquad.h
+	cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/arith.h
+	cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/mg2ec.h
+	cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/mg2ec_const.h
+#	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
+#	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/make.sh
+++ b/make.sh
@@ -342,6 +342,7 @@ buildipfire() {
 #  ipfiremake pulsar			PASS=SMP
 #  ipfiremake unicorn		PASS=SMP
 #  ipfiremake promise-sata-300-tx	PASS=SMP
+  ipfiremake zaptel			PASS=SMP
  ipfiremake linux
 #  ipfiremake 3cp4218
 #  ipfiremake amedyn
@@ -360,6 +361,7 @@ buildipfire() {
 #  ipfiremake pulsar
 #  ipfiremake unicorn
 #  ipfiremake promise-sata-300-tx
+  ipfiremake zaptel
 #  ipfiremake pcmciautils
  ipfiremake expat
  ipfiremake gdbm
@@ -504,12 +506,11 @@ buildipfire() {
  ipfiremake spamassassin
  ipfiremake amavisd
  ipfiremake stund
-exiterror Bis hierhin und nicht weiter!
-  ipfiremake zaptel
  ipfiremake libpri
-  ipfiremake bristuff
+# ipfiremake bristuff
  ipfiremake asterisk
  ipfiremake mpg123
+exiterror Bis hierhin und nicht weiter!
  ipfiremake libmad
  ipfiremake libogg
  ipfiremake libvorbis