From 7c0646ccc0958e14953bf0b77d9bf38a64b15673 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Thu, 8 Jan 2026 14:50:54 +0100 Subject: [PATCH] asterisk: fix module conflicts 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 --- net/asterisk/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 4489287..d175c41 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -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,,))