[Asterisk-code-review] loader: Sync load- and build-time deps. (asterisk[18])

[George Joseph]

George Joseph has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/15119 )

Change subject: loader: Sync load- and build-time deps.
......................................................................

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
---
M funcs/func_odbc.c
M funcs/func_periodic_hook.c
M res/res_hep_pjsip.c
M res/res_odbc.c
M res/res_pjproject.c
M res/res_pjsip.c
M res/res_pjsip_stir_shaken.c
M res/res_prometheus.c
M tests/test_http_media_cache.c
9 files changed, 13 insertions(+), 3 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index acebdcc..5cc0faa 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -1947,4 +1947,5 @@
 	.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 31c534c..e38ff3e 100644
--- a/funcs/func_periodic_hook.c
+++ b/funcs/func_periodic_hook.c
@@ -519,4 +519,5 @@
 	.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 be2f6ea..b1a0377 100644
--- a/res/res_hep_pjsip.c
+++ b/res/res_hep_pjsip.c
@@ -251,5 +251,5 @@
 	.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 da8700d..0dc8124 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -1143,4 +1143,5 @@
 	.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 2bb5d3b..f6dce4c 100644
--- 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 @@
 	.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 8954ef3..f99135a 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -5842,6 +5842,6 @@
 	.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 58e8655..88c1f3b 100644
--- a/res/res_pjsip_stir_shaken.c
+++ b/res/res_pjsip_stir_shaken.c
@@ -325,5 +325,5 @@
 	.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 fdc90cf..3c39733 100644
--- 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 @@
 	.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 2a3398f..c197539 100644
--- a/tests/test_http_media_cache.c
+++ b/tests/test_http_media_cache.c
@@ -697,4 +697,5 @@
 		.load = load_module,
 		.reload = reload_module,
 		.unload = unload_module,
+		.requires = "res_http_media_cache",
 	);

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/15119
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 18
Gerrit-Change-Id: I254dd33194ae38d2877b8021c57c2a5deb6bbcd2
Gerrit-Change-Number: 15119
Gerrit-PatchSet: 3
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-CC: Corey Farrell <git at cfware.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20201120/7ba07d85/attachment.html>