[sr-dev] git:master:2bb65fe9: Revert "Makefile.group: move carrierroute to extra modules, don't depend on libconfuse"

Daniel-Constantin Mierla miconda at gmail.com
Tue Apr 3 23:37:51 CEST 2018


Module: kamailio
Branch: master
Commit: 2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3
URL: https://github.com/kamailio/kamailio/commit/2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2018-04-03T23:34:05+02:00

Revert "Makefile.group: move carrierroute to extra modules, don't depend on libconfuse"

- this reverts commit 8dbfdc7b1213da2b614b4a6d90680ffd0e8a3fc8.
- avoid eventual Jenkins failures when building nightly deb packages
from master
- initial commit should be pushed along with related updates to deb
packaging specs

---

Modified: src/Makefile.groups

---

Diff:  https://github.com/kamailio/kamailio/commit/2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3.diff
Patch: https://github.com/kamailio/kamailio/commit/2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3.patch

---

diff --git a/src/Makefile.groups b/src/Makefile.groups
index 0ee75fe3e6..82834596cf 100644
--- a/src/Makefile.groups
+++ b/src/Makefile.groups
@@ -18,7 +18,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \
 				   auth_xkeys smsops tsilo cfgt statsc topos sipdump
 
 # - extra used modules, with no extra dependency
-mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp carrierroute \
+mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \
 			     pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \
 				 xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \
 			  log_custom keepalive ss7ops app_sqlang acc_diameter evrexec
@@ -71,6 +71,9 @@ mod_list_snmpstats=snmpstats
 # - modules depending on expat library
 mod_list_xmpp=xmpp
 
+# - modules depending on confuse library
+mod_list_carrierroute=carrierroute
+
 # - modules depending on bdb (db4) library
 mod_list_berkeley=db_berkeley
 
@@ -210,7 +213,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \
 			   $(mod_list_mysql) $(mod_list_postgres) \
 			   $(mod_list_unixodbc) $(mod_list_xmldeps) \
 			   $(mod_list_perldeps) $(mod_list_cpl) \
-			   $(mod_list_xmpp) \
+			   $(mod_list_xmpp) $(mod_list_carrierroute) \
 			   $(mod_list_berkeley) $(mod_list_utils) \
 			   $(mod_list_memcached) \
 			   $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) \
@@ -331,6 +334,9 @@ module_group_ksnmpstats=$(mod_list_snmpstats)
 # pkg xmpp module
 module_group_kxmpp=$(mod_list_xmpp)
 
+# pkg carrierroute module
+module_group_kcarrierroute=$(mod_list_carrierroute)
+
 # pkg berkeley module
 module_group_kberkeley=$(mod_list_berkeley)
 




More information about the sr-dev mailing list