From 87eeb0c2a76837f1288c40c3f1726b5b44da2423 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Wed, 2 Oct 2019 20:55:56 +0200 Subject: [PATCH] asterisk-16.x: amend config file handling Use $(INSTALL_CONF) instead of $(CP) for module configuration files. $(INSTALL_CONF) is already used for the init script and utility configuration files Rename ./files/asterisk.config to ./files/asterisk.conf as per OpenWrt package policies page [1]. [1] https://openwrt.org/docs/guide-developer/package-policies Signed-off-by: Sebastian Kemper --- net/asterisk-16.x/Makefile | 6 +++--- net/asterisk-16.x/files/{asterisk.config => asterisk.conf} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename net/asterisk-16.x/files/{asterisk.config => asterisk.conf} (100%) diff --git a/net/asterisk-16.x/Makefile b/net/asterisk-16.x/Makefile index 04e7e45..b8682df 100644 --- a/net/asterisk-16.x/Makefile +++ b/net/asterisk-16.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk AST_MAJOR_VERSION:=16 PKG_NAME:=asterisk$(AST_MAJOR_VERSION) PKG_VERSION:=$(AST_MAJOR_VERSION).3.0 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases @@ -332,7 +332,7 @@ endef define Package/$(PKG_NAME)/install/conffile $(INSTALL_DIR) $(1)/etc/asterisk - $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$(2) $(1)/etc/asterisk/ + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/asterisk/$(2) $(1)/etc/asterisk/ endef define Package/$(PKG_NAME)/install/lib @@ -498,7 +498,7 @@ $(foreach m,$(AST_EMB_MODULES),$(call Package/$(PKG_NAME)/install/module,$(1),$( $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk - $(INSTALL_CONF) ./files/asterisk.config $(1)/etc/config/asterisk + $(INSTALL_CONF) ./files/asterisk.conf $(1)/etc/config/asterisk endef define Package/$(PKG_NAME)-sounds diff --git a/net/asterisk-16.x/files/asterisk.config b/net/asterisk-16.x/files/asterisk.conf similarity index 100% rename from net/asterisk-16.x/files/asterisk.config rename to net/asterisk-16.x/files/asterisk.conf -- 2.30.2