loader: Sync load- and build-time deps.

In MODULEINFO, each depend has to be listed in .requires of AST_MODULE_INFO.

ASTERISK-29148

Change-Id: I254dd33194ae38d2877b8021c57c2a5deb6bbcd2

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index acebdcc51aca5804f393c02ea88c512398ad2673..5cc0faaa98e64913b3b44e768b156591f90cda80 100644 (file)
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -1947,4 +1947,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC lookups",
        .load = load_module,
        .unload = unload_module,
        .reload = reload,
+       .requires = "res_odbc",
 );

diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c
index 31c534cb95517ab49d60fe8dce76d49f0b5fa1e4..e38ff3e7aec53315b11fcf9204e17ae0f8fcdd98 100644 (file)
--- a/funcs/func_periodic_hook.c
+++ b/funcs/func_periodic_hook.c
@@ -519,4 +519,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Periodic dialplan
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
+       .requires = "app_chanspy,func_cut,func_groupcount,func_uri",
 );

diff --git a/res/res_hep_pjsip.c b/res/res_hep_pjsip.c
index be2f6eab0c7ea7a8007f51cede387b2746a22c6a..b1a0377383302f57462e58f8266a8df663e0ef6f 100644 (file)
--- a/res/res_hep_pjsip.c
+++ b/res/res_hep_pjsip.c
@@ -251,5 +251,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PJSIP HEPv3 Logger",
        .support_level = AST_MODULE_SUPPORT_EXTENDED,
        .load = load_module,
        .unload = unload_module,
-       .requires = "res_hep,res_pjsip",
+       .requires = "res_pjsip,res_pjsip_session,res_hep",
 );

diff --git a/res/res_odbc.c b/res/res_odbc.c
index da8700dad541a61d2cfb6f480780416740fd1447..0dc812429f2c67f000a7b18227c3510084bf960b 100644 (file)
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -1143,4 +1143,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
        .unload = unload_module,
        .reload = reload,
        .load_pri = AST_MODPRI_REALTIME_DEPEND,
+       .requires = "res_odbc_transaction",
 );

diff --git a/res/res_pjproject.c b/res/res_pjproject.c
index 2bb5d3bfb408cdaa8f4dbf014e24a7295012669f..f6dce4cd9a19f2a18c03b351b2ad93b4413fda66 100644 (file)
--- a/res/res_pjproject.c
+++ b/res/res_pjproject.c
@@ -34,6 +34,7 @@
 
 /*** MODULEINFO
        <depend>pjproject</depend>
+       <depend>res_sorcery_config</depend>
        <support_level>core</support_level>
  ***/
 
@@ -767,4 +768,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
        .unload = unload_module,
        .reload = reload_module,
        .load_pri = AST_MODPRI_CHANNEL_DEPEND - 6,
+       .requires = "res_sorcery_config",
 );

diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 8954ef3f969e12ef56981b65d71b13a3a7b66fb6..f99135a527b5dd0dcdad7e4e7564e15d12f8d308 100644 (file)
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -5842,6 +5842,6 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
        .unload = unload_module,
        .reload = reload_module,
        .load_pri = AST_MODPRI_CHANNEL_DEPEND - 5,
-       .requires = "dnsmgr,res_pjproject",
+       .requires = "dnsmgr,res_pjproject,res_sorcery_config,res_sorcery_memory,res_sorcery_astdb",
        .optional_modules = "res_statsd",
 );

diff --git a/res/res_pjsip_stir_shaken.c b/res/res_pjsip_stir_shaken.c
index 58e86552af3eb133eee3e7d316b70504e83d4200..88c1f3b7e7d19f4869f54ec118b860e113b24be1 100644 (file)
--- a/res/res_pjsip_stir_shaken.c
+++ b/res/res_pjsip_stir_shaken.c
@@ -325,5 +325,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
        .load = load_module,
        .unload = unload_module,
        .load_pri = AST_MODPRI_DEFAULT,
-       .requires = "res_pjsip,res_stir_shaken",
+       .requires = "res_pjsip,res_pjsip_session,res_stir_shaken",
 );

diff --git a/res/res_prometheus.c b/res/res_prometheus.c
index fdc90cffe93a30c3487d6e66bdd8d03f9f614a46..3c39733f26ccecd2f2bfa70807cbcb25e82716f9 100644 (file)
--- a/res/res_prometheus.c
+++ b/res/res_prometheus.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
        <use>pjproject</use>
+       <use type="module">res_pjsip</use>
        <support_level>extended</support_level>
  ***/
 
@@ -1001,4 +1002,7 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
        .unload = unload_module,
        .reload = reload_module,
        .load_pri = AST_MODPRI_DEFAULT,
+#ifdef HAVE_PJPROJECT
+       .requires = "res_pjsip",
+#endif
 );

diff --git a/tests/test_http_media_cache.c b/tests/test_http_media_cache.c
index 2a3398f18a5b3ec74ebe2536f424c521e1be30f6..c1975390a5e7704a6bd838d7f60a6f733e3e9bab 100644 (file)
--- a/tests/test_http_media_cache.c
+++ b/tests/test_http_media_cache.c
@@ -697,4 +697,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "HTTP Media Cache Backend
                .load = load_module,
                .reload = reload_module,
                .unload = unload_module,
+               .requires = "res_http_media_cache",
        );