mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
voice-client: No longer depends on asterisk18-mod (avoids circular dependancy)
This commit is contained in:
Patrik Stridvall 2016-03-29 16:01:21 +02:00
parent a377af2ccd
commit 27f11d321d
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
asterisk-1.8.x-mod/Makefile
View file

@ -42,6 +42,9 @@ $(call Package/asterisk18-mod/Default)
TITLE:=Complete open source PBX, v1.8x TITLE:=Complete open source PBX, v1.8x
MENU:=1 MENU:=1
DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32 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 endef
define Package/asterisk18-mod/description 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/ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-1.8/include/
endef endef
ifneq ($(CONFIG_PACKAGE_voice-client),y)
define Package/asterisk18-mod/conffiles define Package/asterisk18-mod/conffiles
/etc/asterisk/asterisk.conf /etc/asterisk/asterisk.conf
/etc/asterisk/modules.conf /etc/asterisk/modules.conf
@ -448,14 +452,22 @@ define Package/asterisk18-mod/conffiles
/etc/default/asterisk /etc/default/asterisk
/etc/init.d/asterisk /etc/init.d/asterisk
endef endef
else
define Package/asterisk18-mod/conffiles
/etc/default/asterisk
/etc/init.d/asterisk
endef
endif
define Package/asterisk18-mod/install define Package/asterisk18-mod/install
$(INSTALL_DIR) $(1)/etc/asterisk/ssl $(INSTALL_DIR) $(1)/etc/asterisk/ssl
ifneq ($(CONFIG_PACKAGE_voice-client),y)
for f in asterisk extensions features \ for f in asterisk extensions features \
indications logger manager modules \ indications logger manager modules \
sip sip_notify rtp; do \ sip sip_notify rtp; do \
$(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \ $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \
done done
endif
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
for f in app_dial app_echo app_playback app_macro \ for f in app_dial app_echo app_playback app_macro \
chan_sip res_rtp_asterisk res_rtp_multicast \ 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/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/
endef endef
ifneq ($(CONFIG_PACKAGE_voice-client),y)
define Package/asterisk18-mod-chan-brcm/conffiles define Package/asterisk18-mod-chan-brcm/conffiles
/etc/asterisk/brcm.conf /etc/asterisk/brcm.conf
endef endef
endif
define Package/asterisk18-mod-chan-brcm/install define Package/asterisk18-mod-chan-brcm/install
$(INSTALL_DIR) $(1)/etc/asterisk $(INSTALL_DIR) $(1)/etc/asterisk
ifneq ($(CONFIG_PACKAGE_voice-client),y)
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/brcm.conf $(1)/etc/asterisk/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/brcm.conf $(1)/etc/asterisk/
endif
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_brcm.so $(1)/usr/lib/asterisk/modules/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_brcm.so $(1)/usr/lib/asterisk/modules/
endef endef

1
voice-client/Makefile
View file

@ -16,7 +16,6 @@ define Package/voice-client
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=voice-client TITLE:=voice-client
DEPENDS:=+asterisk18-mod
endef endef
define Package/voice-client/description define Package/voice-client/description