From 94df607771e579336efc0b6b9b1cf7fdd0bbfd9a Mon Sep 17 00:00:00 2001 From: Naveen Albert Date: Thu, 24 Feb 2022 19:33:05 +0000 Subject: [PATCH] build: Remove obsolete leftover build references. Removes some leftover build and config references to modules that have since been removed from Asterisk. ASTERISK-29935 #close Change-Id: Iaefc73a23f4b2de3c6c14d928050135b6d0ef6af --- Zaptel-to-DAHDI.txt | 7 ++++-- channels/Makefile | 2 +- configs/samples/extconfig.conf.sample | 7 +++--- configs/samples/modules.conf.sample | 7 +++--- menuselect/example_menuselect-tree | 22 ----------------- menuselect/test/menuselect-tree | 34 --------------------------- res/res_fax.c | 1 - tests/CI/buildAsterisk.sh | 8 +++---- 8 files changed, 16 insertions(+), 72 deletions(-) diff --git a/Zaptel-to-DAHDI.txt b/Zaptel-to-DAHDI.txt index 4e92f1c3ab..3693d23492 100644 --- a/Zaptel-to-DAHDI.txt +++ b/Zaptel-to-DAHDI.txt @@ -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. @@ -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: diff --git a/channels/Makefile b/channels/Makefile index 7ce84d129d..0af82d9ff0 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -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) diff --git a/configs/samples/extconfig.conf.sample b/configs/samples/extconfig.conf.sample index b633fafa61..0e53823ddf 100644 --- a/configs/samples/extconfig.conf.sample +++ b/configs/samples/extconfig.conf.sample @@ -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 diff --git a/configs/samples/modules.conf.sample b/configs/samples/modules.conf.sample index 56ffe27eee..2ab16d1fd0 100644 --- a/configs/samples/modules.conf.sample +++ b/configs/samples/modules.conf.sample @@ -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 ; in your network. diff --git a/menuselect/example_menuselect-tree b/menuselect/example_menuselect-tree index 83441b1ce9..0b703e6595 100644 --- a/menuselect/example_menuselect-tree +++ b/menuselect/example_menuselect-tree @@ -57,10 +57,6 @@ - - - - no @@ -81,8 +77,6 @@ - - libosptk ssl @@ -143,8 +137,6 @@ - - @@ -211,24 +203,10 @@ - - - - - nbs - - - ossaudio - - - ixjuser - - - vpbapi zaptel diff --git a/menuselect/test/menuselect-tree b/menuselect/test/menuselect-tree index 4c541b5061..371027874a 100644 --- a/menuselect/test/menuselect-tree +++ b/menuselect/test/menuselect-tree @@ -28,9 +28,6 @@ DAHDI - - DAHDI - DAHDI @@ -56,9 +53,6 @@ - - spandsp - @@ -71,10 +65,6 @@ - - - - no @@ -98,8 +88,6 @@ - - osptk ssl @@ -157,8 +145,6 @@ - - @@ -248,20 +234,6 @@ - - isdnnet - misdn - suppserv - - - nbs - - - ossaudio - - - ixjuser - chan_local @@ -274,9 +246,6 @@ usb no - - vpbapi - @@ -477,9 +446,6 @@ pgsql - - sqlite - diff --git a/res/res_fax.c b/res/res_fax.c index be7f5092a5..18d7ab8f35 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -35,7 +35,6 @@ */ /*** MODULEINFO - app_fax core ***/ diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh index 71cfcc6915..6d06f05159 100755 --- a/tests/CI/buildAsterisk.sh +++ b/tests/CI/buildAsterisk.sh @@ -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"