openwrt/telephony
1
0
Fork 0
mirror of https://github.com/openwrt/telephony.git synced 2026-04-15 10:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

asterisk: fix module conflicts

Browse Source 
A module is either essential (shipped as part of the main package) or as
a seperate package. Having both is an install-time conflict.

res-timing-timerfd is an essential module and was correctly added to the
main package with e538fc3f. Remove the additional one.

app_stack is non-essential and was added to the main package as part of
the app_macro removal with 73fd6652. Make it optional again.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider
2026-01-08 14:50:54 +01:00
committed by Jiri Slachta
parent 0122fa1ec9
commit 7c0646ccc0
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/asterisk/Makefile
View File

@@ -314,7 +314,6 @@ MODULES_AVAILABLE:= \
res-stun-monitor \
res-timing-dahdi \
res-timing-pthread \
res-timing-timerfd \
res-tonedetect \
res-websocket-client \
res-xmpp
@@ -506,7 +505,7 @@ AST_CFG_FILES:= \
res_config_sqlite3.conf
AST_EMB_MODULES:=\
app_dial app_echo app_stack app_playback \
app_dial app_echo app_playback \
func_callerid func_logic func_strings func_timeout \
pbx_config res_crypto res_timing_timerfd
@@ -1047,7 +1046,6 @@ $(eval $(call BuildAsteriskModule,res-stir-shaken,STIR/SHAKEN resource module,ST
$(eval $(call BuildAsteriskModule,res-stun-monitor,STUN monitoring,STUN network monitor.,,res_stun_monitor.conf,res_stun_monitor,,))
$(eval $(call BuildAsteriskModule,res-timing-dahdi,DAHDI Timing Interface,DAHDI timing interface.,+$(PKG_NAME)-chan-dahdi,,res_timing_dahdi,,))
$(eval $(call BuildAsteriskModule,res-timing-pthread,pthread Timing Interface,pthread timing interface.,,,res_timing_pthread,,))
$(eval $(call BuildAsteriskModule,res-timing-timerfd,timerfd Timing Interface,timerfd timing interface.,,,res_timing_timerfd,,))
$(eval $(call BuildAsteriskModule,res-tonedetect,Tone detection,Tone detection module.,,,res_tonedetect,,))
$(eval $(call BuildAsteriskModule,res-websocket-client,WebSocket Client,WebSocket Client module.,,websocket_client.conf,res_websocket_client,,))
$(eval $(call BuildAsteriskModule,res-xmpp,XMPP client and component module,Asterisk XMPP interface.,+libiksemel +libopenssl,xmpp.conf,res_xmpp,,))