From 821f9f50ae367a8d353588e74a18661a18d8f576 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 1 Nov 2011 08:00:21 +0100 Subject: [PATCH] Enable isdn modules and addons (mISDN, lcr, asterisk) on arm. --- lfs/asterisk | 6 ++++-- lfs/lcr | 3 +-- lfs/mISDN | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lfs/asterisk b/lfs/asterisk index e1a39773fa..496e47e406 100644 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # @@ -31,7 +31,6 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 PROG = asterisk PAK_VER = 5 @@ -115,6 +114,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.9.tar.gz $(DIR_APP)/sounds/ cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm.tar.gz $(DIR_APP)/sounds/ + # Remove wrong cpu optimization (march=armv5tel) + cd $(DIR_APP) && sed -i -e "s|^PROC=.*||g" makeopts + # compile and install cd $(DIR_APP) && make $(MAKETUNING) all cd $(DIR_APP) && make install diff --git a/lfs/lcr b/lfs/lcr index 8b4e04b740..453afa43dc 100644 --- a/lfs/lcr +++ b/lfs/lcr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # @@ -31,7 +31,6 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 PROG = lcr PAK_VER = 3 diff --git a/lfs/mISDN b/lfs/mISDN index 9c5f4004a3..c73f5196b1 100644 --- a/lfs/mISDN +++ b/lfs/mISDN @@ -33,7 +33,6 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) -SUP_ARCH = i586 ############################################################################### # Top-level Rules @@ -75,6 +74,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch +ifeq "$(MACHINE_TYPE)" "arm" + # Remove unsupported timestampcounter on arm. the result seems to be unused + cd $(DIR_SRC)/mISDN && sed -i -e "s|rdtscl(pChan->ulTimestampIn);||g" drivers/isdn/mISDN/octvqe/octvqe_linux.c +endif cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \ -- 2.39.5