From f05221cde929dbe8386d76745ac0e9f74c412ab6 Mon Sep 17 00:00:00 2001
From: Yalu Zhang <yalu.zhang@iopsys.eu>
Date: Fri, 20 Mar 2020 17:27:58 +0100
Subject: [PATCH] Replace package name from asterisk13 to asterisk in config
 file for all relevant platforms

---
 intel_mips/image/xrx500-iopsys.mk       | 24 ++++++++++++------------
 iopsys-brcm63xx-arm/profiles/iopsys.mk  | 20 ++++++++++----------
 iopsys-brcm63xx-mips/profiles/iopsys.mk | 20 ++++++++++----------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/intel_mips/image/xrx500-iopsys.mk b/intel_mips/image/xrx500-iopsys.mk
index a503589e6..f1cc182c7 100644
--- a/intel_mips/image/xrx500-iopsys.mk
+++ b/intel_mips/image/xrx500-iopsys.mk
@@ -1,17 +1,17 @@
 ifeq ($(SUBTARGET),xrx500)
 
-ASTERISK_PACKAGES := asterisk13 asterisk13-app-confbridge asterisk13-app-playtones
-ASTERISK_PACKAGES += asterisk13-app-read asterisk13-app-record asterisk13-app-system
-ASTERISK_PACKAGES += asterisk13-bridge-builtin-features asterisk13-bridge-simple
-ASTERISK_PACKAGES += asterisk13-bridge-softmix asterisk13-cdr asterisk13-cdr-csv
-ASTERISK_PACKAGES += asterisk13-chan-lantiq asterisk13-chan-sip asterisk13-format-g726
-ASTERISK_PACKAGES += asterisk13-format-g729 asterisk13-format-gsm asterisk13-format-sln
-ASTERISK_PACKAGES += asterisk13-func-channel asterisk13-func-db asterisk13-func-shell
-ASTERISK_PACKAGES += asterisk13-pbx-spool asterisk13-res-musiconhold asterisk13-res-rtp-asterisk
-ASTERISK_PACKAGES += asterisk13-res-timing-timerfd asterisk13-sounds asterisk13-app-transfer
-ASTERISK_PACKAGES += asterisk13-codec-a-mu asterisk13-codec-alaw asterisk13-codec-ulaw
-ASTERISK_PACKAGES += asterisk13-codec-g722 asterisk13-codec-g726 asterisk13-codec-g729
-ASTERISK_PACKAGES += asterisk13-codec-gsm
+ASTERISK_PACKAGES := asterisk asterisk-app-confbridge asterisk-app-playtones
+ASTERISK_PACKAGES += asterisk-app-read asterisk-app-record asterisk-app-system
+ASTERISK_PACKAGES += asterisk-bridge-builtin-features asterisk-bridge-simple
+ASTERISK_PACKAGES += asterisk-bridge-softmix asterisk-cdr asterisk-cdr-csv
+ASTERISK_PACKAGES += asterisk-chan-lantiq asterisk-chan-sip asterisk-format-g726
+ASTERISK_PACKAGES += asterisk-format-g729 asterisk-format-gsm asterisk-format-sln
+ASTERISK_PACKAGES += asterisk-func-channel asterisk-func-db asterisk-func-shell
+ASTERISK_PACKAGES += asterisk-pbx-spool asterisk-res-musiconhold asterisk-res-rtp-asterisk
+ASTERISK_PACKAGES += asterisk-res-timing-timerfd asterisk-sounds asterisk-app-transfer
+ASTERISK_PACKAGES += asterisk-codec-a-mu asterisk-codec-alaw asterisk-codec-ulaw
+ASTERISK_PACKAGES += asterisk-codec-g722 asterisk-codec-g726 asterisk-codec-g729
+ASTERISK_PACKAGES += asterisk-codec-gsm
 
 VOICE_PACKAGES := voice-client $(ASTERISK_PACKAGES) juci-voice-client
 
diff --git a/iopsys-brcm63xx-arm/profiles/iopsys.mk b/iopsys-brcm63xx-arm/profiles/iopsys.mk
index ff377ad9c..6270424f4 100644
--- a/iopsys-brcm63xx-arm/profiles/iopsys.mk
+++ b/iopsys-brcm63xx-arm/profiles/iopsys.mk
@@ -1,14 +1,14 @@
 # Meta package support
-ASTERISK_PACKAGES:=asterisk13 asterisk13-app-playtones asterisk13-app-read \
-asterisk13-app-system asterisk13-app-transfer asterisk13-cdr \
-asterisk13-cdr-csv asterisk13-chan-brcm asterisk13-codec-a-mu \
-asterisk13-codec-alaw asterisk13-codec-g722 asterisk13-codec-g726 \
-asterisk13-codec-gsm asterisk13-format-g726 asterisk13-format-g729 \
-asterisk13-format-sln asterisk13-format-sln16 asterisk13-func-channel \
-asterisk13-func-db asterisk13-func-shell asterisk13-pbx-spool \
-asterisk13-res-stun asterisk13-res-voice asterisk13-sounds \
-asterisk13-format-gsm asterisk13-res-rtp-asterisk asterisk13-chan-sip \
-asterisk13-util-astcanary asterisk13-res-timing-timerfd
+ASTERISK_PACKAGES:=asterisk asterisk-app-playtones asterisk-app-read \
+asterisk-app-system asterisk-app-transfer asterisk-cdr \
+asterisk-cdr-csv asterisk-chan-brcm asterisk-codec-a-mu \
+asterisk-codec-alaw asterisk-codec-g722 asterisk-codec-g726 \
+asterisk-codec-gsm asterisk-format-g726 asterisk-format-g729 \
+asterisk-format-sln asterisk-format-sln16 asterisk-func-channel \
+asterisk-func-db asterisk-func-shell asterisk-pbx-spool \
+asterisk-res-stun asterisk-res-voice asterisk-sounds \
+asterisk-format-gsm asterisk-res-rtp-asterisk asterisk-chan-sip \
+asterisk-util-astcanary asterisk-res-timing-timerfd
 
 VOICE_SUPPORT:=voice-client endptmngr $(ASTERISK_PACKAGES) juci-voice-client
 DECT_SUPPORT:=dectmngr2 juci-natalie-dect
diff --git a/iopsys-brcm63xx-mips/profiles/iopsys.mk b/iopsys-brcm63xx-mips/profiles/iopsys.mk
index 3d955f4b5..3a9a2fa4d 100644
--- a/iopsys-brcm63xx-mips/profiles/iopsys.mk
+++ b/iopsys-brcm63xx-mips/profiles/iopsys.mk
@@ -1,14 +1,14 @@
 # Meta package support
-ASTERISK_PACKAGES:=asterisk13 asterisk13-app-playtones asterisk13-app-read \
-asterisk13-app-system asterisk13-app-transfer asterisk13-cdr \
-asterisk13-cdr-csv asterisk13-chan-brcm asterisk13-codec-a-mu \
-asterisk13-codec-alaw asterisk13-codec-g722 asterisk13-codec-g726 \
-asterisk13-codec-gsm asterisk13-format-g726 asterisk13-format-g729 \
-asterisk13-format-sln asterisk13-format-sln16 asterisk13-func-channel \
-asterisk13-func-db asterisk13-func-shell asterisk13-pbx-spool \
-asterisk13-res-stun asterisk13-res-voice asterisk13-sounds \
-asterisk13-format-gsm asterisk13-res-rtp-asterisk asterisk13-chan-sip \
-asterisk13-util-astcanary asterisk13-res-timing-timerfd
+ASTERISK_PACKAGES:=asterisk asterisk-app-playtones asterisk-app-read \
+asterisk-app-system asterisk-app-transfer asterisk-cdr \
+asterisk-cdr-csv asterisk-chan-brcm asterisk-codec-a-mu \
+asterisk-codec-alaw asterisk-codec-g722 asterisk-codec-g726 \
+asterisk-codec-gsm asterisk-format-g726 asterisk-format-g729 \
+asterisk-format-sln asterisk-format-sln16 asterisk-func-channel \
+asterisk-func-db asterisk-func-shell asterisk-pbx-spool \
+asterisk-res-stun asterisk-res-voice asterisk-sounds \
+asterisk-format-gsm asterisk-res-rtp-asterisk asterisk-chan-sip \
+asterisk-util-astcanary asterisk-res-timing-timerfd
 
 VOICE_SUPPORT:=voice-client endptmngr $(ASTERISK_PACKAGES) juci-voice-client
 DECT_SUPPORT:=natalie-dect dectmngr2 juci-natalie-dect
-- 
GitLab