From 27f11d321d561a76aa8230a55e7b8f73604aab21 Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Tue, 29 Mar 2016 16:01:21 +0200
Subject: [PATCH] asterisk-1.8.x-mod: Don't install config files that are
 generated from templates by voice-client if CONFIG_PACKAGE_voice-client=y
 depend on it instead voice-client: No longer depends on asterisk18-mod
 (avoids circular dependancy)

---
 asterisk-1.8.x-mod/Makefile | 16 ++++++++++++++++
 voice-client/Makefile       |  1 -
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/asterisk-1.8.x-mod/Makefile b/asterisk-1.8.x-mod/Makefile
index 98819aaab..3c82da66b 100644
--- a/asterisk-1.8.x-mod/Makefile
+++ b/asterisk-1.8.x-mod/Makefile
@@ -42,6 +42,9 @@ $(call Package/asterisk18-mod/Default)
   TITLE:=Complete open source PBX, v1.8x
   MENU:=1
   DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
+ifeq ($(CONFIG_PACKAGE_voice-client),y)
+  DEPENDS+= +voice-client
+endif
 endef
 
 define Package/asterisk18-mod/description
@@ -434,6 +437,7 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-1.8/include/
 endef
 
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 define Package/asterisk18-mod/conffiles
 /etc/asterisk/asterisk.conf
 /etc/asterisk/modules.conf
@@ -448,14 +452,22 @@ define Package/asterisk18-mod/conffiles
 /etc/default/asterisk
 /etc/init.d/asterisk
 endef
+else
+define Package/asterisk18-mod/conffiles
+/etc/default/asterisk
+/etc/init.d/asterisk
+endef
+endif
 
 define Package/asterisk18-mod/install
 	$(INSTALL_DIR) $(1)/etc/asterisk/ssl
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 	for f in asterisk extensions features \
 		indications logger manager modules \
 		sip sip_notify rtp; do \
 		$(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \
 	done
+endif
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	for f in app_dial app_echo app_playback app_macro \
 		chan_sip res_rtp_asterisk res_rtp_multicast \
@@ -628,13 +640,17 @@ define Package/asterisk18-mod-chan-skinny/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/
 endef
 
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 define Package/asterisk18-mod-chan-brcm/conffiles
 /etc/asterisk/brcm.conf
 endef
+endif
 
 define Package/asterisk18-mod-chan-brcm/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/brcm.conf $(1)/etc/asterisk/
+endif
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_brcm.so $(1)/usr/lib/asterisk/modules/
 endef
diff --git a/voice-client/Makefile b/voice-client/Makefile
index b68fbf896..0ea8f5e85 100644
--- a/voice-client/Makefile
+++ b/voice-client/Makefile
@@ -16,7 +16,6 @@ define Package/voice-client
   SECTION:=net
   CATEGORY:=Network
   TITLE:=voice-client
-  DEPENDS:=+asterisk18-mod
 endef
 
 define Package/voice-client/description
-- 
GitLab