Skip to content

Commit

Permalink
build: Remove obsolete leftover build references.
Browse files Browse the repository at this point in the history
Removes some leftover build and config references to
modules that have since been removed from Asterisk.

ASTERISK-29935 #close

Change-Id: Iaefc73a23f4b2de3c6c14d928050135b6d0ef6af
  • Loading branch information
InterLinked1 authored and kharwell committed Mar 30, 2022
1 parent 0e31df6 commit 94df607
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 72 deletions.
7 changes: 5 additions & 2 deletions Zaptel-to-DAHDI.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ renamed; the new names are:

chan_zap.so -> chan_dahdi.so
app_zapbarge.so -> app_dahdibarge.so
app_zapras.so -> app_dahdiras.so
app_zapscan.so -> app_dahdiscan.so
codec_zap.so -> codec_dahdi.so

The following modules have been removed:
app_zapras.so -> app_dahdiras.so

Second, the behavior of many modules has changed due to the switch to
DAHDI; the changes are listed below.

Expand All @@ -46,7 +48,8 @@ app_dahdibarge.so:

app_dahdiras.so:

The ZapRAS application has been renamed to DAHDIRAS.
The ZapRAS application was renamed to DAHDIRAS. This application has
since been removed.

app_dahdiscan.so:

Expand Down
2 changes: 1 addition & 1 deletion channels/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ chan_unistim.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
chan_phone.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
chan_sip.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)

$(call MOD_ADD_C,chan_oss,console_video.c vgrabbers.c console_board.c)
$(call MOD_ADD_C,console_video.c vgrabbers.c console_board.c)
7 changes: 3 additions & 4 deletions configs/samples/extconfig.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,15 @@
; "odbc" is shown in the examples below, but is not the only valid realtime
; engine. Here are several of the possible options:
; odbc ... res_config_odbc
; sqlite ... res_config_sqlite
; sqlite3 ... res_config_sqlite3
; pgsql ... res_config_pgsql
; curl ... res_config_curl
; ldap ... res_config_ldap
; mysql ... res_config_mysql (available via add-ons in menuselect)
;
; Note: The res_config_pgsql and res_config_sqlite backends configure the
; database used in their respective configuration files and ignore the
; database name configured in this file.
; Note: The res_config_pgsql backend configures the database used in their
; respective configuration files and ignore the database name configured in
; this file.
;
;iaxusers => odbc,asterisk
;iaxpeers => odbc,asterisk
Expand Down
7 changes: 3 additions & 4 deletions configs/samples/modules.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ autoload=yes
;
;load = res_musiconhold.so
;
; Load one of: chan_oss, alsa, or console (portaudio).
; By default, load chan_oss only (automatically).
; Load one of: alsa, or console (portaudio).
; By default, load chan_console only (automatically).
;
noload = chan_alsa.so
noload = chan_console.so
;noload = chan_oss.so
;noload = chan_console.so
;
; Do not load res_hep and kin unless you are using HEP monitoring
; <http://sipcapture.org> in your network.
Expand Down
22 changes: 0 additions & 22 deletions menuselect/example_menuselect-tree
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@
</member>
<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
</member>
<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
</member>
<member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
</member>
<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
<defaultenabled>no</defaultenabled>
</member>
Expand All @@ -81,8 +77,6 @@
</member>
<member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
</member>
<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
</member>
<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
<depend>libosptk</depend>
<depend>ssl</depend>
Expand Down Expand Up @@ -143,8 +137,6 @@
</member>
<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
</member>
<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
</member>
<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
</member>
<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
Expand Down Expand Up @@ -211,24 +203,10 @@
<member name="chan_local" displayname="Local Proxy Channel" remove_on_change="channels/chan_local.o channels/chan_local.so">
</member>
<member name="chan_mgcp" displayname="Media Gateway Control Protocol (MGCP)" remove_on_change="channels/chan_mgcp.o channels/chan_mgcp.so">
</member>
<member name="chan_misdn" displayname="Channel driver for mISDN Support (Bri/Pri)" remove_on_change="channels/chan_misdn.o channels/chan_misdn.so">
</member>
<member name="chan_nbs" displayname="Network Broadcast Sound Driver" remove_on_change="channels/chan_nbs.o channels/chan_nbs.so">
<depend>nbs</depend>
</member>
<member name="chan_oss" displayname="OSS Console Channel Driver" remove_on_change="channels/chan_oss.o channels/chan_oss.so">
<depend>ossaudio</depend>
</member>
<member name="chan_phone" displayname="Standard Linux Telephony API Driver" remove_on_change="channels/chan_phone.o channels/chan_phone.so">
<depend>ixjuser</depend>
</member>
<member name="chan_sip" displayname="Session Initiation Protocol (SIP)" remove_on_change="channels/chan_sip.o channels/chan_sip.so">
</member>
<member name="chan_skinny" displayname="Skinny Client Control Protocol (Skinny)" remove_on_change="channels/chan_skinny.o channels/chan_skinny.so">
</member>
<member name="chan_vpb" displayname="Standard VoiceTronix API Driver" remove_on_change="channels/chan_vpb.o channels/chan_vpb.so">
<depend>vpbapi</depend>
</member>
<member name="chan_zap" displayname="Zapata Telephony" remove_on_change="channels/chan_zap.o channels/chan_zap.so">
<depend>zaptel</depend>
Expand Down
34 changes: 0 additions & 34 deletions menuselect/test/menuselect-tree
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
<member name="app_dahdibarge" displayname="Barge in on DAHDI channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
<depend name="dahdi">DAHDI</depend>
</member>
<member name="app_dahdiras" displayname="DAHDI ISDN Remote Access Server" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
<depend name="dahdi">DAHDI</depend>
</member>
<member name="app_dahdiscan" displayname="Scan DAHDI channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
<depend name="dahdi">DAHDI</depend>
</member>
Expand All @@ -56,9 +53,6 @@
</member>
<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
</member>
<member name="app_fax" displayname="Simple FAX Application" remove_on_change="apps/app_fax.o apps/app_fax.so">
<depend>spandsp</depend>
</member>
<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
</member>
<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
Expand All @@ -71,10 +65,6 @@
</member>
<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
</member>
<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
</member>
<member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
</member>
<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
<defaultenabled>no</defaultenabled>
</member>
Expand All @@ -98,8 +88,6 @@
</member>
<member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
</member>
<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
</member>
<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
<depend>osptk</depend>
<depend>ssl</depend>
Expand Down Expand Up @@ -157,8 +145,6 @@
</member>
<member name="app_transfer" displayname="Transfers a caller to another extension" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
</member>
<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
</member>
<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
</member>
<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
Expand Down Expand Up @@ -248,20 +234,6 @@
</member>
<member name="chan_mgcp" displayname="Media Gateway Control Protocol (MGCP)" remove_on_change="channels/chan_mgcp.o channels/chan_mgcp.so">
</member>
<member name="chan_misdn" displayname="Channel driver for mISDN Support (BRI/PRI)" remove_on_change="channels/chan_misdn.o channels/chan_misdn.so">
<depend>isdnnet</depend>
<depend>misdn</depend>
<depend>suppserv</depend>
</member>
<member name="chan_nbs" displayname="Network Broadcast Sound Support" remove_on_change="channels/chan_nbs.o channels/chan_nbs.so">
<depend>nbs</depend>
</member>
<member name="chan_oss" displayname="OSS Console Channel Driver" remove_on_change="channels/chan_oss.o channels/chan_oss.so">
<depend>ossaudio</depend>
</member>
<member name="chan_phone" displayname="Linux Telephony API Support" remove_on_change="channels/chan_phone.o channels/chan_phone.so">
<depend>ixjuser</depend>
</member>
<member name="chan_sip" displayname="Session Initiation Protocol (SIP)" remove_on_change="channels/chan_sip.o channels/chan_sip.so">
<depend>chan_local</depend>
</member>
Expand All @@ -274,9 +246,6 @@
<depend>usb</depend>
<defaultenabled>no</defaultenabled>
</member>
<member name="chan_vpb" displayname="Voicetronix API driver" remove_on_change="channels/chan_vpb.oo channels/chan_vpb.so">
<depend>vpbapi</depend>
</member>
</category>
<category name="MENUSELECT_CODECS" displayname="Codec Translators" remove_on_change="codecs/modules.link">
<member name="codec_adpcm" displayname="Adaptive Differential PCM Coder/Decoder" remove_on_change="codecs/codec_adpcm.o codecs/codec_adpcm.so">
Expand Down Expand Up @@ -477,9 +446,6 @@
<member name="res_config_pgsql" displayname="PostgreSQL RealTime Configuration Driver" remove_on_change="res/res_config_pgsql.o res/res_config_pgsql.so">
<depend>pgsql</depend>
</member>
<member name="res_config_sqlite" displayname="Realtime SQLite configuration" remove_on_change="res/res_config_sqlite.o res/res_config_sqlite.so">
<depend>sqlite</depend>
</member>
<member name="res_convert" displayname="File format conversion CLI command" remove_on_change="res/res_convert.o res/res_convert.so">
</member>
<member name="res_crypto" displayname="Cryptographic Digital Signatures" remove_on_change="res/res_crypto.o res/res_crypto.so">
Expand Down
1 change: 0 additions & 1 deletion res/res_fax.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*/

/*** MODULEINFO
<conflict>app_fax</conflict>
<support_level>core</support_level>
***/

Expand Down
8 changes: 4 additions & 4 deletions tests/CI/buildAsterisk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,14 @@ if [ $NO_MENUSELECT -eq 0 ] ; then
# These modules are not tested at all. They are loaded but nothing is ever done
# with them, no testsuite tests depend on them.
mod_disables+=" app_adsiprog app_alarmreceiver app_celgenuserevent app_db app_dictate"
mod_disables+=" app_dumpchan app_externalivr app_festival app_getcpeid app_ices app_image"
mod_disables+=" app_jack app_milliwatt app_minivm app_morsecode app_mp3 app_nbscat app_privacy"
mod_disables+=" app_readexten app_sms app_speech_utils app_test app_url app_waitforring"
mod_disables+=" app_dumpchan app_externalivr app_festival app_getcpeid"
mod_disables+=" app_jack app_milliwatt app_minivm app_morsecode app_mp3 app_privacy"
mod_disables+=" app_readexten app_sms app_speech_utils app_test app_waitforring"
mod_disables+=" app_waitforsilence app_waituntil app_zapateller"
mod_disables+=" cdr_adaptive_odbc cdr_custom cdr_manager cdr_odbc cdr_pgsql cdr_radius"
mod_disables+=" cdr_tds"
mod_disables+=" cel_odbc cel_pgsql cel_radius cel_sqlite3_custom cel_tds"
mod_disables+=" chan_alsa chan_console chan_mgcp chan_motif chan_oss chan_rtp chan_skinny chan_unistim"
mod_disables+=" chan_alsa chan_console chan_mgcp chan_motif chan_rtp chan_skinny chan_unistim"
mod_disables+=" func_frame_trace func_pitchshift func_speex func_volume func_dialgroup"
mod_disables+=" func_periodic_hook func_sprintf func_enum func_extstate func_sysinfo func_iconv"
mod_disables+=" func_callcompletion func_version func_rand func_sha1 func_module func_md5"
Expand Down

0 comments on commit 94df607

Please sign in to comment.