This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, thirteen has been updated via b9d51680a64a7da279807b1d9901e206749db97f (commit) via 544f40d4f87f6705e680a5da031cd917f24e140c (commit) via 708577a905ecdc5c9a2e7b113088b11d486db44c (commit) from 7837dadb730282ecceae4e7e0811f91b38a00e4d (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit b9d51680a64a7da279807b1d9901e206749db97f Merge: 544f40d 7837dad Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Aug 31 12:24:16 2012 -0400

Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen

commit 544f40d4f87f6705e680a5da031cd917f24e140c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Aug 29 12:25:24 2012 -0400

dahdi: remove package.

dahdi big-kernel-log that is disabled in kernel3 and it does not compile on arm.

commit 708577a905ecdc5c9a2e7b113088b11d486db44c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Aug 29 12:23:22 2012 -0400

file: rootfile update.

-----------------------------------------------------------------------

Summary of changes: config/asterisk/asterisk.makeopts | 25 ++++-- config/rootfiles/packages/asterisk | 24 ++++-- config/rootfiles/packages/dahdi | 150 ------------------------------------ lfs/dahdi | 140 --------------------------------- make.sh | 8 +-- 5 files changed, 33 insertions(+), 314 deletions(-) delete mode 100644 config/rootfiles/packages/dahdi delete mode 100644 lfs/dahdi

Difference in files: diff --git a/config/asterisk/asterisk.makeopts b/config/asterisk/asterisk.makeopts index 6fa4c11..60a311b 100644 --- a/config/asterisk/asterisk.makeopts +++ b/config/asterisk/asterisk.makeopts @@ -1,26 +1,31 @@ -MENUSELECT_ADDONS=format_mp3 -MENUSELECT_APPS=app_fax app_jack app_osplookup +MENUSELECT_ADDONS=format_mp3 +MENUSELECT_APPS=app_flash app_meetme app_page app_dahdiras app_fax app_jack app_osplookup app_dahdibarge MENUSELECT_BRIDGES= MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds -MENUSELECT_CHANNELS=chan_console chan_gtalk chan_jingle chan_misdn chan_nbs chan_vpb chan_h323 -MENUSELECT_CODECS=codec_ilbc codec_resample codec_speex +MENUSELECT_CHANNELS=chan_dahdi chan_console chan_gtalk chan_jingle chan_misdn chan_nbs chan_vpb chan_h323 +MENUSELECT_CODECS=codec_dahdi codec_resample codec_speex MENUSELECT_FORMATS= MENUSELECT_FUNCS=func_odbc func_speex MENUSELECT_PBX=pbx_lua -MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_srtp res_timing_timerfd res_ais res_config_pgsql res_config_sqlite res_jabber res_timing_kqueue +MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_srtp res_timing_dahdi res_ais res_config_pgsql res_config_sqlite res_jabber res_timing_kqueue MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils MENUSELECT_CFLAGS=LOADABLE_MODULES -MENUSELECT_OPTS_app_voicemail= -MENUSELECT_UTILS= +MENUSELECT_OPTS_app_voicemail=FILE_STORAGE +MENUSELECT_UTILS=astcanary aelparse astman check_expr check_expr2 conf2ael hashtest hashtest2 muted refcounter smsq stereorize streamplayer MENUSELECT_AGIS= MENUSELECT_EMBED= MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-GSM MENUSELECT_EXTRA_SOUNDS=EXTRA-SOUNDS-EN-GSM -MENUSELECT_BUILD_DEPS=chan_local app_voicemail app_meetme res_monitor res_agi res_adsi res_smdi res_crypto res_pktccops res_ael_share res_fax G711_NEW_ALGORITHM +MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_pktccops res_ael_share res_fax G711_NEW_ALGORITHM +MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_flash +MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_meetme +MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_page +MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdiras MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup +MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdibarge MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql @@ -31,6 +36,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds +MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_dahdi MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_gtalk MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_jingle @@ -38,6 +44,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323 +MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_dahdi MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_resample MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc @@ -51,7 +58,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_srtp -MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_timerfd +MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_dahdi MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_ais MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 7e7b25e..7a02653 100644 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -156,8 +156,6 @@ usr/lib/asterisk/modules/app_channelredirect.so usr/lib/asterisk/modules/app_chanspy.so usr/lib/asterisk/modules/app_confbridge.so usr/lib/asterisk/modules/app_controlplayback.so -usr/lib/asterisk/modules/app_dahdibarge.so -usr/lib/asterisk/modules/app_dahdiras.so usr/lib/asterisk/modules/app_db.so usr/lib/asterisk/modules/app_dial.so usr/lib/asterisk/modules/app_dictate.so @@ -169,7 +167,6 @@ usr/lib/asterisk/modules/app_echo.so usr/lib/asterisk/modules/app_exec.so usr/lib/asterisk/modules/app_externalivr.so usr/lib/asterisk/modules/app_festival.so -usr/lib/asterisk/modules/app_flash.so usr/lib/asterisk/modules/app_followme.so usr/lib/asterisk/modules/app_forkcdr.so usr/lib/asterisk/modules/app_getcpeid.so @@ -177,7 +174,6 @@ usr/lib/asterisk/modules/app_ices.so usr/lib/asterisk/modules/app_image.so usr/lib/asterisk/modules/app_ivrdemo.so usr/lib/asterisk/modules/app_macro.so -usr/lib/asterisk/modules/app_meetme.so usr/lib/asterisk/modules/app_milliwatt.so usr/lib/asterisk/modules/app_minivm.so usr/lib/asterisk/modules/app_mixmonitor.so @@ -186,7 +182,6 @@ usr/lib/asterisk/modules/app_mp3.so usr/lib/asterisk/modules/app_mysql.so usr/lib/asterisk/modules/app_nbscat.so usr/lib/asterisk/modules/app_originate.so -usr/lib/asterisk/modules/app_page.so usr/lib/asterisk/modules/app_parkandannounce.so usr/lib/asterisk/modules/app_playback.so usr/lib/asterisk/modules/app_playtones.so @@ -237,7 +232,6 @@ usr/lib/asterisk/modules/chan_agent.so usr/lib/asterisk/modules/chan_alsa.so usr/lib/asterisk/modules/chan_bridge.so usr/lib/asterisk/modules/chan_capi.so -usr/lib/asterisk/modules/chan_dahdi.so usr/lib/asterisk/modules/chan_iax2.so usr/lib/asterisk/modules/chan_local.so usr/lib/asterisk/modules/chan_mgcp.so @@ -252,10 +246,10 @@ usr/lib/asterisk/modules/chan_unistim.so usr/lib/asterisk/modules/codec_a_mu.so usr/lib/asterisk/modules/codec_adpcm.so usr/lib/asterisk/modules/codec_alaw.so -usr/lib/asterisk/modules/codec_dahdi.so usr/lib/asterisk/modules/codec_g722.so usr/lib/asterisk/modules/codec_g726.so usr/lib/asterisk/modules/codec_gsm.so +usr/lib/asterisk/modules/codec_ilbc.so usr/lib/asterisk/modules/codec_lpc10.so usr/lib/asterisk/modules/codec_ulaw.so usr/lib/asterisk/modules/format_g719.so @@ -351,18 +345,32 @@ usr/lib/asterisk/modules/res_smdi.so usr/lib/asterisk/modules/res_snmp.so usr/lib/asterisk/modules/res_speech.so usr/lib/asterisk/modules/res_stun_monitor.so -usr/lib/asterisk/modules/res_timing_dahdi.so usr/lib/asterisk/modules/res_timing_pthread.so +usr/lib/asterisk/modules/res_timing_timerfd.so #usr/lib/pkgconfig/asterisk.pc +usr/sbin/aelparse +usr/sbin/astcanary usr/sbin/asterisk usr/sbin/astgenkey +usr/sbin/astman usr/sbin/autosupport +usr/sbin/check_expr +usr/sbin/check_expr2 +usr/sbin/conf2ael +usr/sbin/hashtest +usr/sbin/hashtest2 +usr/sbin/muted usr/sbin/rasterisk +usr/sbin/refcounter usr/sbin/safe_asterisk +usr/sbin/smsq +usr/sbin/stereorize +usr/sbin/streamplayer #usr/share/man/man8/asterisk.8 #usr/share/man/man8/astgenkey.8 #usr/share/man/man8/autosupport.8 #usr/share/man/man8/safe_asterisk.8 +#var/ipfire/asterisk var/ipfire/asterisk/adsi.conf var/ipfire/asterisk/agents.conf var/ipfire/asterisk/ais.conf diff --git a/config/rootfiles/packages/dahdi b/config/rootfiles/packages/dahdi deleted file mode 100644 index d3291b8..0000000 --- a/config/rootfiles/packages/dahdi +++ /dev/null @@ -1,150 +0,0 @@ -etc/dahdi -etc/modprobe.d/dahdi.blacklist.conf -etc/modprobe.d/dahdi.conf -etc/rc.d/init.d/dahdi -etc/rc.d/rc0.d/K30dahdi -etc/rc.d/rc3.d/S15dahdi -etc/rc.d/rc6.d/K30dahdi -etc/udev/rules.d/dahdi.rules -etc/udev/rules.d/xpp.rules -lib/firmware/.dahdi-fw-hx8-2.06 -lib/firmware/.dahdi-fw-oct6114-064-1.05.01 -lib/firmware/.dahdi-fw-oct6114-128-1.05.01 -lib/firmware/.dahdi-fw-oct6114-256-1.05.01 -lib/firmware/.dahdi-fw-tc400m-MR6.12 -lib/firmware/.dahdi-fw-te820-1.76 -lib/firmware/.dahdi-fw-vpmoct032-1.12.0 -lib/firmware/dahdi-fw-hx8.bin -lib/firmware/dahdi-fw-oct6114-064.bin -lib/firmware/dahdi-fw-oct6114-128.bin -lib/firmware/dahdi-fw-oct6114-256.bin -lib/firmware/dahdi-fw-tc400m.bin -lib/firmware/dahdi-fw-te820.bin -lib/firmware/dahdi-fw-vpmoct032.bin -#usr/include/dahdi -#usr/include/dahdi/dahdi_config.h -#usr/include/dahdi/fasthdlc.h -#usr/include/dahdi/kernel.h -#usr/include/dahdi/tonezone.h -#usr/include/dahdi/user.h -#usr/include/dahdi/wctdm_user.h -#usr/lib/hotplug -#usr/lib/hotplug/firmware -usr/lib/hotplug/firmware/.dahdi-fw-hx8-2.06 -usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-1.05.01 -usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-1.05.01 -usr/lib/hotplug/firmware/.dahdi-fw-oct6114-256-1.05.01 -usr/lib/hotplug/firmware/.dahdi-fw-tc400m-MR6.12 -usr/lib/hotplug/firmware/.dahdi-fw-te820-1.76 -usr/lib/hotplug/firmware/.dahdi-fw-vpmoct032-1.12.0 -usr/lib/hotplug/firmware/dahdi-fw-hx8.bin -usr/lib/hotplug/firmware/dahdi-fw-oct6114-064.bin -usr/lib/hotplug/firmware/dahdi-fw-oct6114-128.bin -usr/lib/hotplug/firmware/dahdi-fw-oct6114-256.bin -usr/lib/hotplug/firmware/dahdi-fw-tc400m.bin -usr/lib/hotplug/firmware/dahdi-fw-te820.bin -usr/lib/hotplug/firmware/dahdi-fw-vpmoct032.bin -#usr/lib/libtonezone.a -#usr/lib/libtonezone.so -usr/lib/libtonezone.so.1 -usr/lib/libtonezone.so.1.0 -usr/lib/libtonezone.so.2 -usr/lib/libtonezone.so.2.0 -usr/lib/perl5/site_perl/5.12.3/Dahdi -usr/lib/perl5/site_perl/5.12.3/Dahdi.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Chans.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Chandahdi.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Freepbxdb.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Modules.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/System.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Unicall.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Users.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Xpporder.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Params.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware -usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware/PCI.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware/USB.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Span.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Utils.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp -usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp/Line.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp/Mpp.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp/Xbus.pm -usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp/Xpd.pm -usr/sbin/astribank_allow -usr/sbin/astribank_hexload -usr/sbin/astribank_is_starting -usr/sbin/astribank_tool -usr/sbin/dahdi_cfg -usr/sbin/dahdi_genconf -usr/sbin/dahdi_hardware -usr/sbin/dahdi_maint -usr/sbin/dahdi_monitor -usr/sbin/dahdi_registration -usr/sbin/dahdi_scan -usr/sbin/dahdi_speed -usr/sbin/dahdi_test -usr/sbin/dahdi_tool -usr/sbin/fpga_load -usr/sbin/fxotune -usr/sbin/lsdahdi -usr/sbin/sethdlc -usr/sbin/twinstar -usr/sbin/xpp_blink -usr/sbin/xpp_sync -usr/share/dahdi -usr/share/dahdi/FPGA_1141.hex -usr/share/dahdi/FPGA_1151.hex -usr/share/dahdi/FPGA_1161.201.hex -usr/share/dahdi/FPGA_1161.hex -usr/share/dahdi/FPGA_FXS.hex -usr/share/dahdi/PIC_TYPE_1.hex -usr/share/dahdi/PIC_TYPE_2.hex -usr/share/dahdi/PIC_TYPE_3.hex -usr/share/dahdi/PIC_TYPE_4.hex -usr/share/dahdi/USB_FW.201.hex -usr/share/dahdi/USB_FW.hex -usr/share/dahdi/USB_RECOV.hex -usr/share/dahdi/XppConfig.pm -usr/share/dahdi/astribank_hook -usr/share/dahdi/init_card_1_30 -usr/share/dahdi/init_card_2_30 -usr/share/dahdi/init_card_3_30 -usr/share/dahdi/init_card_4_30 -usr/share/dahdi/init_card_5_30 -usr/share/dahdi/waitfor_xpds -usr/share/dahdi/xpp_fxloader -#usr/share/man/man8/astribank_allow.8 -#usr/share/man/man8/astribank_hexload.8 -#usr/share/man/man8/astribank_is_starting.8 -#usr/share/man/man8/astribank_tool.8 -#usr/share/man/man8/dahdi_cfg.8 -#usr/share/man/man8/dahdi_genconf.8 -#usr/share/man/man8/dahdi_hardware.8 -#usr/share/man/man8/dahdi_maint.8 -#usr/share/man/man8/dahdi_monitor.8 -#usr/share/man/man8/dahdi_registration.8 -#usr/share/man/man8/dahdi_scan.8 -#usr/share/man/man8/dahdi_test.8 -#usr/share/man/man8/dahdi_tool.8 -#usr/share/man/man8/fpga_load.8 -#usr/share/man/man8/fxotune.8 -#usr/share/man/man8/lsdahdi.8 -#usr/share/man/man8/twinstar.8 -#usr/share/man/man8/xpp_blink.8 -#usr/share/man/man8/xpp_sync.8 -#var/ipfire/asterisk -var/ipfire/asterisk/dahdi -var/ipfire/asterisk/dahdi/genconf_parameters -var/ipfire/asterisk/dahdi/init.conf -var/ipfire/asterisk/dahdi/modules -var/ipfire/asterisk/dahdi/system.conf -var/ipfire/asterisk/hotplug -var/ipfire/asterisk/hotplug/usb -var/ipfire/asterisk/hotplug/usb/xpp_fxloader -var/ipfire/asterisk/hotplug/usb/xpp_fxloader.usermap diff --git a/lfs/dahdi b/lfs/dahdi deleted file mode 100644 index 48840bd..0000000 --- a/lfs/dahdi +++ /dev/null @@ -1,140 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # -# # -# 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX=ipfire$(KCFG) - -VER = 2.6.1 -TVER = 2.6.1 - -DL_FILE = dahdi-linux-$(VER).tar.gz -DL_FILE1 = dahdi-tools-$(TVER).tar.gz - -THISAPP = dahdi-$(VER) -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/dahdi-linux-$(VER) -DIR_APP1 = $(DIR_SRC)/dahdi-tools-$(TVER) - -PROG = dahdi -PAK_VER = 3 - -DEPS = "" - -ifeq "$(KMOD)" "1" - TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) -else - TARGET = $(DIR_INFO)/$(THISAPP) -endif - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.6.1-firmware.tar.gz - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1) -dahdi-linux-2.6.1-firmware.tar.gz = $(DL_FROM)/dahdi-linux-2.6.1-firmware.tar.gz - -$(DL_FILE)_MD5 = 75932fe3d4a6e656165aaaa7a1377305 -$(DL_FILE1)_MD5 = c2e4f476a8e7f96a5cad46dd9b648446 -dahdi-linux-2.6.1-firmware.tar.gz_MD5 = cb804d1b4dd1b644d3c1638daa12dcf5 - -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) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - - rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC) && tar axf $(DIR_DL)/dahdi-linux-2.6.1-firmware.tar.gz - cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)-$(VERSUFIX) - -ifeq "$(KMOD)" "1" - cd $(DIR_APP) && make install-modules KVERS=$(KVER)-$(VERSUFIX) - @rm -rf $(DIR_APP) -else - cd $(DIR_APP) && make install-devices install-include \ - install-firmware install-xpp-firm KVERS=$(KVER)-$(VERSUFIX) - @rm -rf $(DIR_APP) - - # remove previous generated symlink (if this a rebuild) - rm -rf /etc/dahdi - - rm -rf $(DIR_APP1) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE1) - cd $(DIR_APP1) && ./configure --sysconfdir=/var/ipfire/asterisk - cd $(DIR_APP1) && make $(MAKETUNING) clean all - cd $(DIR_APP1) && make install - - # Supress Error output because this erase the log - cd $(DIR_APP1) && make config 2>/dev/null - - # remove build src - @rm -rf $(DIR_APP1) - - # config stuff - ln -sf ../init.d/dahdi /etc/rc.d/rc0.d/K30dahdi - ln -sf ../init.d/dahdi /etc/rc.d/rc6.d/K30dahdi - ln -sf ../init.d/dahdi /etc/rc.d/rc3.d/S15dahdi - mv -f /etc/dahdi/genconf_parameters /var/ipfire/asterisk/dahdi/ - mv -f /etc/dahdi/init.conf /var/ipfire/asterisk/dahdi/ - mv -f /etc/dahdi/modules /var/ipfire/asterisk/dahdi/ - rmdir /etc/dahdi - ln -s /var/ipfire/asterisk/dahdi /etc/dahdi - - # make init.d-script work with ipfire - sed s/system=redhat/system=debian/ /etc/init.d/dahdi > /tmp/dahdi-temp - mv /tmp/dahdi-temp /etc/init.d/dahdi && chmod 755 /etc/init.d/dahdi - - # add dummy-module (to get conference rooms work) - echo "#Dummy" >> /etc/dahdi/modules - echo "dahdi_dummy" >> /etc/dahdi/modules -endif - @$(POSTBUILD) diff --git a/make.sh b/make.sh index eb847e4..f2dfbab 100755 --- a/make.sh +++ b/make.sh @@ -381,7 +381,6 @@ buildipfire() { ipfiremake linux2 KCFG="-xen" # ipfiremake v4l-dvb KCFG="-xen" # ipfiremake mISDN KCFG="-xen" - ipfiremake dahdi KCFG="-xen" KMOD=1 ipfiremake cryptodev KCFG="-xen" ipfiremake compat-wireless KCFG="-xen" # ipfiremake r8169 KCFG="-xen" @@ -396,7 +395,6 @@ buildipfire() { # ipfiremake v4l-dvb KCFG="-pae" ipfiremake alsa KCFG="-pae" KMOD=1 # ipfiremake mISDN KCFG="-pae" - ipfiremake dahdi KCFG="-pae" KMOD=1 ipfiremake cryptodev KCFG="-pae" ipfiremake compat-wireless KCFG="-pae" # ipfiremake r8169 KCFG="-pae" @@ -411,7 +409,6 @@ buildipfire() { # ipfiremake v4l-dvb KCFG="" ipfiremake alsa KCFG="" KMOD=1 # ipfiremake mISDN KCFG="" - ipfiremake dahdi KCFG="" KMOD=1 ipfiremake cryptodev KCFG="" ipfiremake compat-wireless KCFG="" # ipfiremake r8169 KCFG="" @@ -427,7 +424,6 @@ buildipfire() { # ipfiremake v4l-dvb KCFG="-rpi" # ipfiremake kvm-kmod KCFG="-rpi" # ipfiremake mISDN KCFG="-rpi" -# ipfiremake dahdi KCFG="-rpi" KMOD=1 ipfiremake cryptodev KCFG="-rpi" ipfiremake compat-wireless KCFG="-rpi" # ipfiremake r8169 KCFG="-rpi" @@ -441,7 +437,6 @@ buildipfire() { # ipfiremake v4l-dvb KCFG="-omap" # ipfiremake kvm-kmod KCFG="-omap" # ipfiremake mISDN KCFG="-omap" -# ipfiremake dahdi KCFG="-omap" KMOD=1 ipfiremake cryptodev KCFG="-omap" ipfiremake compat-wireless KCFG="-omap" # ipfiremake r8169 KCFG="-omap" @@ -456,7 +451,6 @@ buildipfire() { # ipfiremake v4l-dvb KCFG="-kirkwood" # ipfiremake kvm-kmod KCFG="-kirkwood" # ipfiremake mISDN KCFG="-kirkwood" -# ipfiremake dahdi KCFG="-kirkwood" KMOD=1 ipfiremake cryptodev KCFG="-kirkwood" ipfiremake compat-wireless KCFG="-kirkwood" # ipfiremake r8169 KCFG="-kirkwood" @@ -465,6 +459,7 @@ buildipfire() { # ipfiremake e1000 KCFG="-kirkwood" # ipfiremake e1000e KCFG="-kirkwood" # ipfiremake igb KCFG="-kirkwood" + fi ipfiremake pkg-config ipfiremake linux-atm @@ -731,7 +726,6 @@ buildipfire() { ipfiremake nut ipfiremake watchdog ipfiremake libpri - ipfiremake dahdi ipfiremake asterisk ipfiremake lcr ipfiremake usb_modeswitch

hooks/post-receive -- IPFire 2.x development tree