Merge branch 'develop' into anatar818-patch-28

Author: anatar818

conf/distro/include/rdk-bpi.inc

@@ -38,6 +38,10 @@ DISTRO_FEATURES_append = " partner_default_ext"
 #Enable SDcard image as default
 DISTRO_FEATURES_append = " sdmmc"
 
+DISTRO_FEATURE_append = " rdkb_voice_manager_dmltr104_v2"
+
+DISTRO_FEATURE_append = " telco_voice_feature_enable_persist"
+
 #PPP Feature
 #DISTRO_FEATURES_append = "ppp-enabled"
 

conf/include/rdk-bpi-bbmasks.inc

@@ -12,3 +12,4 @@ BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','|meta-cmf-filogic/
 BBMASK .= "|meta-cmf-filogic/recipes-ccsp/util/utopia-headers.bb"
 BBMASK .= "|meta-cmf-filogic/recipes-ccsp/hal/halinterface.bbappend"
 BBMASK .= "|meta-filogic/recipes-wifi/hal/halinterface.bbappend"
+BBMASK .= "|meta-rdk-ext/recipes-telephony/asterisk/asterisk_18.5.0.bb"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend

@@ -81,6 +81,7 @@ do_install_append_class-target() {
 SYSTEMD_SERVICE_${PN}_remove_onewifi = " ccspwifiagent.service"
 SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', 'onewifi.service ', '', d)}"
 SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'webconfig_bin', 'webconfig.service', '', d)}"
+SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_wan_manager', 'RdkTelcoVoiceManager.service', '', d)}"
 SYSTEMD_SERVICE_${PN} += " CcspTelemetry.service"
 SYSTEMD_SERVICE_${PN} += " notifyComp.service"
 SYSTEMD_SERVICE_${PN} += "gwprovapp.service"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml

@@ -214,6 +214,9 @@
   <Record name="eRT.com.cisco.spvtg.ccsp.tr181pa.Device.WiFi.Radio.2.FactoryResetSSID" type="astr">0</Record>
   <Record name="eRT.com.cisco.spvtg.ccsp.tr181pa.Device.WiFi.SsidUpgradeRequired" type="astr">1</Record>
 
+ <!-- Ethernet interfaces of BananaPi Pi -->
+  <Record name="dmsb.ethagent.ethifcount" type="astr">4</Record>
+
   <Record name="dmsb.BridgeNamePrefix" type="astr">brlan</Record>
   <Record name="dmsb.bridgeVlanRange" type="astr">164...512</Record>
 

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/Ethernet-Lan-changes.patch

@@ -47,9 +47,9 @@ Index: ethsw/rdkb_hal/src/ethsw/ccsp_hal_ethsw.c
      memset(&ifr, 0, sizeof(ifr));
 -    snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", "eth1");
 +    if (PortId == 1)
-+	snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "erouter0");
++	       snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", "erouter0");
 +    else
-+        snprintf(ifr.ifr_name, sizeof(ifr.ifr_name),"lan",(PortId-1));
++        snprintf(ifr.ifr_name, sizeof(ifr.ifr_name),"lan%d",(PortId-1));
 
      if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
      {

meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-broadband-image.bbappend

@@ -1,5 +1,5 @@
 #WebPA Feature
-IMAGE_INSTALL_append = " parodus parodus2ccsp"
+IMAGE_INSTALL_append = " parodus parodus2ccsp rdktelcovoicemanager asterisk hal-voice-asterisk"
 
 #TR069 Feature
 IMAGE_INSTALL_append = " ccsp-tr069-pa"

meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend

@@ -11,4 +11,5 @@ RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " \
 GWPROVAPP = "${@bb.utils.contains('DISTRO_FEATURES','rdkb_wan_manager','ccsp-gwprovapp', '' ,d)}"
 
 RDEPENDS_packagegroup-rdk-ccsp-broadband_append = "${@bb.utils.contains('DISTRO_FEATURES', 'rdkb_cellular_manager_mm', ' rdk-cellularmanager-mm', ' ', d)}"
-RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " gw-lan-refresh"
+RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " rdktelcovoicemanager"
+RDEPENDS_packagegroup-rdk-ccsp-broadband_append = " gw-lan-refresh"