Merge branch 'develop' into anatar818-patch-22

Author: cpokuru

.github/workflows/cla.yml

@@ -1,13 +1,20 @@
 name: "CLA"
+
+permissions:
+  contents: read
+  pull-requests: write
+  actions: write
+  statuses: write
+
 on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened,closed,synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
   CLA-Lite:
     name: "Signature"
-    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@main
+    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@v1
     secrets:
-      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}
+      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}

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

@@ -1,7 +1,6 @@
 BBMASK .= "|meta-cmf-filogic/recipes-extended/tdkb/"
 
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-filogic/recipes-wifi/hostapd/', '', d)}"
-BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-filogic/recipes-wifi/hal/halinterface.bbappend', '', d)}"
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', '|meta-cmf-filogic/recipes-common/mesh-agent/mesh-agent.bbappend', '', d)}"
 
 BBMASK_append_kirkstone .= "|meta-rdk-opensync/recipes/python3-jinja2/python3-jinja2_2.11.1.bb"
@@ -12,3 +11,5 @@ BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','|openembedded-core
 BBMASK .= "${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','|meta-cmf-filogic/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend','',d)}"
 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

@@ -56,6 +56,9 @@ do_install_append_class-target() {
    #SNMP SUPPORT
    sed -i "/tcp\:192.168.254.253\:705/a  ExecStart=\/usr\/bin\/snmp_subagent \&" ${D}${systemd_unitdir}/system/snmpSubAgent.service
 
+   #Xdns service 
+   install -D -m 0644 ${S}/systemd_units/CcspXdnsSsp.service ${D}${systemd_unitdir}/system/CcspXdnsSsp.service
+
    #Updating the checkfilogicwifisupport.service
    sed -i "s/forking/oneshot/g"  ${D}${systemd_unitdir}/system/checkfilogicwifisupport.service
    sed -i "/ExecStart=/i RemainAfterExit=yes" ${D}${systemd_unitdir}/system/checkfilogicwifisupport.service
@@ -78,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"
@@ -87,6 +91,7 @@ SYSTEMD_SERVICE_${PN} += "parodus.service"
 SYSTEMD_SERVICE_${PN} += "webpa.service"
 SYSTEMD_SERVICE_${PN}_remove = " utopia.service"
 SYSTEMD_SERVICE_${PN} += " CcspAdvSecuritySsp.service"
+SYSTEMD_SERVICE_${PN} += "CcspXdnsSsp.service"
 
 FILES_${PN}_remove_onewifi = "${systemd_unitdir}/system/ccspwifiagent.service"
 FILES_${PN}_remove = "${systemd_unitdir}/system/utopia.service" 
@@ -97,6 +102,7 @@ FILES_${PN}_append = " \
    ${systemd_unitdir}/system/CcspTelemetry.service \
    ${systemd_unitdir}/system/notifyComp.service \
    ${systemd_unitdir}/system/gwprovapp.service \
+   ${systemd_unitdir}/system/CcspXdnsSsp.service \
    ${systemd_unitdir}/system/gwprovapp.service.d/gwprovapp.conf \
    ${systemd_unitdir}/system/parodus.service \
    ${systemd_unitdir}/system/webpa.service \

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend

@@ -1,7 +1,7 @@
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
 
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=libwebconfig"
-SRCREV_libwebconfig = "0ff4e4323043775d09e363df71959707c7666853"
+SRCREV_libwebconfig = "3b7620e682234e92b269d77a84eaf1fc7a1b6176"
 
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap unified-wifi-mesh-header ', '', d)}"
 EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend

@@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=OneWifi"
 SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=OneWifi"
-SRCREV_OneWifi = "0ff4e4323043775d09e363df71959707c7666853"
+SRCREV_OneWifi = "3b7620e682234e92b269d77a84eaf1fc7a1b6176"
 DEPENDS_append = " mesh-agent "
 DEPENDS_remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"

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

@@ -1281,5 +1281,7 @@
   <Record name="dmsb.wanmanager.if.2.VirtualInterface.1.VlanCount" type="astr">0</Record>
   <Record name="dmsb.wanmanager.if.2.VirtualInterface.1.MarkingCount" type="astr">0</Record>
   <!-- Webconfig.service auto start record -->
-  <Record name="eRT.com.cisco.spvtg.ccsp.webpa.WebConfigRfcEnable" type="astr">true</Record>	  
+  <Record name="eRT.com.cisco.spvtg.ccsp.webpa.WebConfigRfcEnable" type="astr">true</Record>	 
+  <!-- Default WPA3 transition start record -->
+  <Record name="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.WPA3_Personal_Transition.Enable" type="astr">1</Record> 
 </Provision>

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/fix_device_dm_taking_long_time.patch

@@ -0,0 +1,37 @@
+diff --git a/config/RdkTelcoVoiceManager_v1.xml b/config/RdkTelcoVoiceManager_v1.xml
+index f07200a..b8c26d8 100644
+--- a/config/RdkTelcoVoiceManager_v1.xml
++++ b/config/RdkTelcoVoiceManager_v1.xml
+@@ -61,14 +61,16 @@
+                             <name>Voice</name>
+                             <objectType>object</objectType>
+                             <functions>
+-                                <func_GetParamUlongValue>X_RDK_Report_VoiceService_GetParamUlongValue</func_GetParamUlongValue>
++				    <!--
++				<func_GetParamUlongValue>X_RDK_Report_VoiceService_GetParamUlongValue</func_GetParamUlongValue>
+                                 <func_SetParamUlongValue>X_RDK_Report_VoiceService_SetParamUlongValue</func_SetParamUlongValue>
+                                 <func_GetParamStringValue>X_RDK_Report_VoiceService_GetParamStringValue</func_GetParamStringValue>
+                                 <func_GetParamBoolValue>X_RDK_Report_VoiceService_GetParamBoolValue</func_GetParamBoolValue>
+                                 <func_SetParamBoolValue>X_RDK_Report_VoiceService_SetParamBoolValue</func_SetParamBoolValue>
+                                 <func_Validate>X_RDK_Report_VoiceService_Validate</func_Validate>
+                                 <func_Commit>X_RDK_Report_VoiceService_Commit</func_Commit>
+-                                <func_Rollback>X_RDK_Report_VoiceService_Rollback</func_Rollback>
++				<func_Rollback>X_RDK_Report_VoiceService_Rollback</func_Rollback>
++				    -->
+                             </functions>
+                             <parameters>
+                                 <parameter>
+@@ -98,9 +100,11 @@
+                                 <object>
+                                     <name>Default</name>
+                                     <objectType>object</objectType>
+-                                    <functions>
++				    <functions>
++					    <!--
+                                         <func_GetParamUlongValue>X_RDK_Report_VoiceService_Default_GetParamUlongValue</func_GetParamUlongValue>
+-                                        <func_SetParamUlongValue>X_RDK_Report_VoiceService_Default_SetParamUlongValue</func_SetParamUlongValue>
++					<func_SetParamUlongValue>X_RDK_Report_VoiceService_Default_SetParamUlongValue</func_SetParamUlongValue>
++					    -->
+                                     </functions>
+                                     <parameters>
+                                         <parameter>

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/rdktelcovoicemanager.bbappend

@@ -0,0 +1,18 @@
+include ccsp_common_bananapi.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://fix_device_dm_taking_long_time.patch;apply=no "
+
+do_voice_patch() {
+    cd ${S}
+    if [ ! -e bpi_voice_patch_applied ]; then
+        bbnote "Patching fix_device_dm_taking_long_time.patch"
+        patch -p1 < ${WORKDIR}/fix_device_dm_taking_long_time.patch
+
+       touch bpi_voice_patch_applied
+    fi
+}
+addtask voice_patch after do_unpack before do_compile
+
+INHIBIT_PACKAGE_STRIP = "1"

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/0002-Add-EHT-support.patch

@@ -0,0 +1,17 @@
+SOURCE:mediatek
+
+diff --git a/include/wifi_hal_generic.h b/include/wifi_hal_generic.h
+index b81ad05..2a6f33e 100644
+--- a/include/wifi_hal_generic.h
++++ b/include/wifi_hal_generic.h
+@@ -328,7 +328,9 @@ typedef enum{
+     WIFI_CHANNELBANDWIDTH_80MHZ = 0x4,
+     WIFI_CHANNELBANDWIDTH_160MHZ = 0x8,
+     WIFI_CHANNELBANDWIDTH_80_80MHZ = 0x10,
+-    WIFI_CHANNELBANDWIDTH_320MHZ = 0x20
++    WIFI_CHANNELBANDWIDTH_320MHZ = 0x20,
++    WIFI_CHANNELBANDWIDTH_320_1MHZ = 0x40,
++    WIFI_CHANNELBANDWIDTH_320_2MHZ = 0x80
+ } wifi_channelBandwidth_t;
+ 
+ /**