fix menuselect usage

- update menuselect config
- make sure config path is provided for every menuselect invocation
  (otherwise defaults are used instead)

diff --git a/asterisk.spec b/asterisk.spec
index 833f54825a64997e31ee134dab66d2c344dd60d8..98aada4025625783561ecc7b30505999f5ddcb9f 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -873,10 +873,11 @@ menuselect/menuselect --disable cdr_radius --disable cel_radius menuselect.makeo
 menuselect/menuselect --disable res_pjsip --disable chan_pjsip menuselect.makeopts
 %endif
 %if %{without opus_vp8}
-menuselect/menuselect --disable codec_opus_open_source --disable format_ogg_opus_open_source
+menuselect/menuselect --disable codec_opus_open_source --disable format_ogg_opus_open_source menuselect.makeopts
 %endif
+
 %if %{without malloc_debug}
-menuselect/menuselect --disable MALLOC_DEBUG
+menuselect/menuselect --disable MALLOC_DEBUG menuselect.makeopts
 %endif
 
 %{__sed} -i -e 's/^MENUSELECT_OPTS_app_voicemail=.*$/MENUSELECT_OPTS_app_voicemail=FILE_STORAGE/' menuselect.makeopts

diff --git a/menuselect.makedeps b/menuselect.makedeps
index d37aa71c4df5eaf23fed49e76d45dd13ea80a800..4b0f8047625bb80a436b52cf78ee0087a8290a0b 100644 (file)
--- a/menuselect.makedeps
+++ b/menuselect.makedeps
@@ -32,14 +32,21 @@ MENUSELECT_DEPENDS_chan_vpb=VPB
 MENUSELECT_DEPENDS_codec_dahdi=DAHDI 
 MENUSELECT_DEPENDS_codec_gsm=GSM 
 MENUSELECT_DEPENDS_codec_ilbc=ILBC 
-MENUSELECT_DEPENDS_codec_speex=SPEEX SPEEX_PREPROCESS SPEEXDSP 
-MENUSELECT_DEPENDS_codec_opus_open_source=OPUS
 MENUSELECT_DEPENDS_codec_lpc10=LPC10 
-MENUSELECT_DEPENDS_format_ogg_vorbis=VORBIS OGG
-MENUSELECT_DEPENDS_format_ogg_opus_open_source=OPUSFILE
+MENUSELECT_DEPENDS_codec_speex=SPEEX SPEEX_PREPROCESS SPEEXDSP 
+MENUSELECT_DEPENDS_codec_opus_open_source=OPUS 
+MENUSELECT_DEPENDS_codec_opus=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_codec_silk=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_codec_siren7=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_codec_siren14=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_codec_g729a=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_format_ogg_vorbis=VORBIS OGG 
+MENUSELECT_DEPENDS_format_ogg_opus_open_source=OPUSFILE 
 MENUSELECT_DEPENDS_func_aes=CRYPTO 
 MENUSELECT_DEPENDS_func_curl=CURL 
 MENUSELECT_DEPENDS_func_iconv=ICONV 
+MENUSELECT_DEPENDS_func_pjsip_aor=PJPROJECT 
+MENUSELECT_DEPENDS_func_pjsip_contact=PJPROJECT 
 MENUSELECT_DEPENDS_func_pjsip_endpoint=PJPROJECT 
 MENUSELECT_DEPENDS_func_speex=SPEEX SPEEX_PREPROCESS SPEEXDSP 
 MENUSELECT_DEPENDS_pbx_dundi=ZLIB CRYPTO 
@@ -54,22 +61,25 @@ MENUSELECT_DEPENDS_res_crypto=OPENSSL
 MENUSELECT_DEPENDS_res_curl=CURL 
 MENUSELECT_DEPENDS_res_http_post=GMIME 
 MENUSELECT_DEPENDS_res_odbc=GENERIC_ODBC LTDL 
+MENUSELECT_DEPENDS_res_odbc_transaction=GENERIC_ODBC 
+MENUSELECT_DEPENDS_res_pjproject=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_acl=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_authenticator_digest=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_caller_id=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_config_wizard=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_dialog_info_body_generator=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_diversion=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_dlg_options=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_dtmf_info=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_empty_info=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_endpoint_identifier_anonymous=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_endpoint_identifier_ip=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_endpoint_identifier_user=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_exten_state=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_header_funcs=PJPROJECT 
-MENUSELECT_DEPENDS_res_pjsip_log_forwarder=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_logger=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_messaging=PJPROJECT 
-MENUSELECT_DEPENDS_res_pjsip_multihomed=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_mwi=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_mwi_body_generator=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_nat=PJPROJECT 
@@ -91,7 +101,9 @@ MENUSELECT_DEPENDS_res_pjsip_rfc3326=PJPROJECT
 MENUSELECT_DEPENDS_res_pjsip_sdp_rtp=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_send_to_voicemail=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_session=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_sips_contact=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_t38=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_transport_management=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_transport_websocket=PJPROJECT 
 MENUSELECT_DEPENDS_res_pjsip_xpidf_body_generator=PJPROJECT 
 MENUSELECT_DEPENDS_res_rtp_asterisk=PJPROJECT 
@@ -106,8 +118,11 @@ MENUSELECT_DEPENDS_res_config_sqlite=SQLITE
 MENUSELECT_DEPENDS_res_corosync=COROSYNC 
 MENUSELECT_DEPENDS_res_fax_spandsp=SPANDSP 
 MENUSELECT_DEPENDS_res_hep_pjsip=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_history=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_phoneprov_provider=PJPROJECT 
 MENUSELECT_DEPENDS_res_snmp=NETSNMP 
 MENUSELECT_DEPENDS_res_timing_kqueue=KQUEUE 
+MENUSELECT_DEPENDS_res_digium_phone=XMLSTARLET BASH 
 MENUSELECT_DEPENDS_test_abstract_jb=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_acl=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_amihooks=TEST_FRAMEWORK 
@@ -132,6 +147,7 @@ MENUSELECT_DEPENDS_test_dlinklists=TEST_FRAMEWORK
 MENUSELECT_DEPENDS_test_endpoints=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_event=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_expr=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_file=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_format_cache=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_format_cap=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_func_file=TEST_FRAMEWORK 
@@ -144,10 +160,12 @@ MENUSELECT_DEPENDS_test_linkedlists=TEST_FRAMEWORK
 MENUSELECT_DEPENDS_test_locale=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_logger=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_message=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_named_lock=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_netsock2=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_optional_api=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_pbx=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_poll=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_res_pjsip_scheduler=TEST_FRAMEWORK PJPROJECT 
 MENUSELECT_DEPENDS_test_res_stasis=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_sched=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_scoped_lock=TEST_FRAMEWORK 
@@ -155,6 +173,7 @@ MENUSELECT_DEPENDS_test_security_events=TEST_FRAMEWORK
 MENUSELECT_DEPENDS_test_skel=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_sorcery=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_sorcery_astdb=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_sorcery_memory_cache_thrash=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_sorcery_realtime=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_stasis=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_stasis_channels=TEST_FRAMEWORK 
@@ -168,6 +187,7 @@ MENUSELECT_DEPENDS_test_time=TEST_FRAMEWORK
 MENUSELECT_DEPENDS_test_uri=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_utils=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_uuid=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_vector=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_voicemail_api=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_websocket_client=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_xml_escape=TEST_FRAMEWORK 
@@ -175,6 +195,10 @@ MENUSELECT_DEPENDS_BETTER_BACKTRACES=BFD DLADDR
 MENUSELECT_DEPENDS_BUILD_NATIVE=NATIVE_ARCH 
 MENUSELECT_DEPENDS_REBUILD_PARSERS=BISON FLEX 
 MENUSELECT_DEPENDS_USE_HOARD_ALLOCATOR=HOARD 
+MENUSELECT_DEPENDS_ADDRESS_SANITIZER=HAVE_ADDRESS_SANITIZER 
+MENUSELECT_DEPENDS_THREAD_SANITIZER=HAVE_THREAD_SANITIZER 
+MENUSELECT_DEPENDS_LEAK_SANITIZER=HAVE_LEAK_SANITIZER 
+MENUSELECT_DEPENDS_UNDEFINED_SANITIZER=HAVE_UNDEFINED_SANITIZER 
 MENUSELECT_DEPENDS_ODBC_STORAGE=GENERIC_ODBC LTDL 
 MENUSELECT_DEPENDS_IMAP_STORAGE=IMAP_TK OPENSSL 
 MENUSELECT_DEPENDS_astman=NEWT 

diff --git a/menuselect.makeopts b/menuselect.makeopts
index 12f0318200171ece337639c9b95ab40f0e2a5c77..5dcadf8b01495d2a73bae4d6e2d9d986e2a328b2 100644 (file)
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -1,24 +1,24 @@
-MENUSELECT_ADDONS=chan_ooh323 format_mp3
-MENUSELECT_APPS=app_skel app_ivrdemo 
+MENUSELECT_ADDONS=chan_ooh323 format_mp3 
+MENUSELECT_APPS=app_skel app_fax app_ivrdemo 
 MENUSELECT_BRIDGES=
 MENUSELECT_CDR=cdr_sqlite 
 MENUSELECT_CEL=
 MENUSELECT_CHANNELS=chan_misdn chan_nbs chan_vpb 
-MENUSELECT_CODECS=codec_opus
+MENUSELECT_CODECS=codec_opus codec_silk codec_siren7 codec_siren14 codec_g729a 
 MENUSELECT_FORMATS=
 MENUSELECT_FUNCS=
 MENUSELECT_PBX=
-MENUSELECT_RES=res_stasis_mailbox res_stasis_test res_timing_kqueue 
-MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ari test_ari_model test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_bucket test_callerid test_cdr test_cel test_channel_feature_hooks test_config test_core_codec test_core_format test_db test_devicestate test_dlinklists test_endpoints test_event test_expr test_format_cache test_format_cap test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_json test_linkedlists test_locale test_logger test_message test_netsock2 test_optional_api test_pbx test_poll test_res_stasis test_sched test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_stringfields test_strings test_substitution test_taskprocessor test_threadpool test_time test_uri test_utils test_uuid test_voicemail_api test_websocket_client test_xml_escape 
-MENUSELECT_CFLAGS=LOADABLE_MODULES BUILD_NATIVE OPTIONAL_API MALLOC_DEBUG
+MENUSELECT_RES=res_ari_mailboxes res_stasis_mailbox res_stasis_test res_timing_kqueue res_digium_phone 
+MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ari test_ari_model test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_bucket test_callerid test_cdr test_cel test_channel_feature_hooks test_config test_core_codec test_core_format test_db test_devicestate test_dlinklists test_endpoints test_event test_expr test_file test_format_cache test_format_cap test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_json test_linkedlists test_locale test_logger test_message test_named_lock test_netsock2 test_optional_api test_pbx test_poll test_res_pjsip_scheduler test_res_stasis test_sched test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_memory_cache_thrash test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_stringfields test_strings test_substitution test_taskprocessor test_threadpool test_time test_uri test_utils test_uuid test_vector test_voicemail_api test_websocket_client test_xml_escape 
+MENUSELECT_CFLAGS=LOADABLE_MODULES MALLOC_DEBUG BUILD_NATIVE OPTIONAL_API 
 MENUSELECT_OPTS_app_voicemail=FILE_STORAGE 
-MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb aelparse astman conf2ael muted smsq stereorize streamplayer
+MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb aelparse astman conf2ael muted smsq stereorize streamplayer 
 MENUSELECT_AGIS=
 MENUSELECT_EMBED=
 MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM 
 MENUSELECT_MOH=MOH-OPSOUND-WAV 
 MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_BUILD_DEPS=bridge_holding app_voicemail app_cdr app_confbridge res_monitor res_speech res_agi res_stasis res_adsi res_odbc res_smdi res_xmpp res_pjsip res_pjsip_session res_crypto res_http_websocket app_chanspy func_cut func_groupcount func_uri res_ael_share res_ari res_mwi_external res_sorcery_config res_pjsip_pubsub res_pjsip_exten_state res_pjsip_outbound_publish res_stasis_recording res_statsd res_fax res_hep G711_NEW_ALGORITHM 
+MENUSELECT_BUILD_DEPS=bridge_holding app_cdr app_confbridge res_monitor res_speech res_agi res_stasis res_adsi res_smdi res_odbc res_xmpp res_pjsip res_pjsip_session res_pktccops res_crypto res_http_websocket app_chanspy func_cut func_groupcount func_uri res_ael_share res_ari res_ari_model res_stasis_recording res_stasis_playback res_stasis_answer res_stasis_snoop res_stasis_device_state func_periodic_hook res_mwi_external res_odbc_transaction res_pjproject res_sorcery_config res_sorcery_memory res_sorcery_astdb res_pjsip_pubsub res_pjsip_exten_state res_pjsip_outbound_publish res_statsd res_fax res_hep res_phoneprov DONT_OPTIMIZE G711_NEW_ALGORITHM 
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
 MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
 MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_stasis_test
@@ -47,6 +47,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_endpoints
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_file
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_cache
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_cap
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file
@@ -59,10 +60,12 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_message
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_named_lock
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_optional_api
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_res_pjsip_scheduler
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_res_stasis
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_scoped_lock
@@ -70,6 +73,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_astdb
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_memory_cache_thrash
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_realtime
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis_channels
@@ -83,6 +87,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_uri
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_uuid
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_vector
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_voicemail_api
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_websocket_client
 MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_xml_escape