Merge branch 'develop' into RDKBACCL-537_RNDIS

manigandanj · web-flow · commit 4ffcd4b16b48 · 2025-10-29T21:07:39.000+05:30
diff --git a/conf/distro/include/rdk-bpi.inc b/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"
 
diff --git a/conf/include/rdk-bpi-bbmasks.inc b/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"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend b/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"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend b/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 = "f924f1de23eb51ad5e99b968f3be38a3588a5b36"
+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)}"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend b/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 = "f924f1de23eb51ad5e99b968f3be38a3588a5b36"
+SRCREV_OneWifi = "3b7620e682234e92b269d77a84eaf1fc7a1b6176"
 DEPENDS_append = " mesh-agent "
 DEPENDS_remove = " opensync "
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend
@@ -1 +1,2 @@
 include ccsp_common_bananapi.inc
+SRC_URI:remove = "file://filogic-factoryReset.patch"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml b/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>
 
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/Ethernet-Lan-changes.patch b/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)
      {
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-hal.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-hal.bbappend
@@ -1,7 +1,7 @@
 SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-hal"
 
 SRC_URI += "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-hal"
-SRCREV_rdk-wifi-hal = "82a9c7b54364bd499d068ada7fe2ae2fe9235072"
+SRCREV_rdk-wifi-hal = "7cbf2c7a892e9d10be0fc8fa3ad85c7a7aeb511c"
 
 CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_  -DBANANA_PI_PORT  -DFEATURE_SINGLE_PHY -DCONFIG_HW_CAPABILITIES "
 
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-halif.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-halif.bbappend
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
   
 SRC_URI_remove_onewifi = "git://github.com/rdkcentral/rdkb-halif-wifi.git;protocol=https;branch=main"
 SRC_URI_onewifi = "git://github.com/rdkcentral/rdkb-halif-wifi.git;protocol=https;branch=develop"
-SRCREV_onewifi = "9d27d77e094761d3d3446f8024fc34c0f4df441a"
+SRCREV_onewifi = "5e98c960363bd79027775101cbd9d11c5e9d6c26"
 
 SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ', ' file://sta-network-wifiagent.patch', d)}"
 SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'OneWifi', ' ', ' file://0002-Add-EHT-support.patch', d)}"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-util.bbappend b/meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-util.bbappend
@@ -1,4 +1,4 @@
 SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-util"
 
 SRC_URI = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-util"
-SRCREV_rdk-wifi-util = "82a9c7b54364bd499d068ada7fe2ae2fe9235072"
+SRCREV_rdk-wifi-util = "7cbf2c7a892e9d10be0fc8fa3ad85c7a7aeb511c"
diff --git a/meta-rdk-mtk-bpir4/recipes-ccsp/unified-wifi-mesh/unified-wifi-mesh-header.bb b/meta-rdk-mtk-bpir4/recipes-ccsp/unified-wifi-mesh/unified-wifi-mesh-header.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e0b1ae637439c7d6f4487fb90163c79a"
 
 SRC_URI = "git://github.com/rdkcentral/unified-wifi-mesh.git;branch=main;protocol=https;name=Unified-wifi-mesh_header"
 PV = "git${SRCPV}"
-SRCREV_Unified-wifi-mesh_header = "565a10bbf6b0c7bd8d9c81c41b3611f77fd02793"
+SRCREV_Unified-wifi-mesh_header = "0e441b6668a0f882cb884d63e089b8a6fbfea3f5"
 SRCREV_FORMAT = "Unified-wifi-mesh_header"
 S = "${WORKDIR}/git"
 
diff --git a/meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-broadband-image.bbappend b/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"
diff --git a/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend b/meta-rdk-mtk-bpir4/recipes-core/packagegroups/packagegroup-rdk-ccsp-broadband.bbappend
@@ -15,4 +15,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"
diff --git a/meta-rdk-mtk-bpir4/recipes-wifi/hostapd/files/hostapd-init-EHT.patch b/meta-rdk-mtk-bpir4/recipes-wifi/hostapd/files/hostapd-init-EHT.patch
@@ -0,0 +1,98 @@
+SOURCE:RDKM
+--- ./hostapd-init-EHT.sh	2025-10-22 11:15:20.021034563 +0100
++++ ./hostapd-init-EHT.sh	2025-10-22 13:30:43.085766313 +0100
+@@ -157,7 +157,11 @@
+             iw wlan$phyidx del > /dev/null
+         elif [ -e /sys/class/net/wifi$phyidx ]; then
+             for((i=0;i<$vap_per_radio;i++)); do
+-                ifidx=$(($phyidx+$i*$radio_num))
++                if [ $phyidx -lt 2 ]; then
++                           ifidx=$(($phyidx+($i*2)))
++                elif [ $phyidx -eq 2 ]; then
++                           ifidx=$(($i+16))
++                fi
+                 ifname="$(cat /nvram/hostapd"$ifidx".conf | grep ^interface= | cut -d '=' -f2 | tr -d '\n')"
+                 if [ -n $ifname ]; then
+                     hostapd_cli -i global raw REMOVE wifi$ifidx > /dev/null
+@@ -173,14 +177,24 @@
+ 			continue
+         fi
+
+-        if [ ! -f /nvram/hostapd"$devidx".conf ]; then
+-            touch /nvram/hostapd"$devidx".conf
++        if [ $devidx -eq 2 ]; then
++            real_idx=16
++        else
++            real_idx=$devidx
++        fi
++
++        if [ ! -f /nvram/hostapd"$real_idx".conf ]; then
++            touch /nvram/hostapd"$real_idx".conf
+         else
+             for((i=0;i<$vap_per_radio;i++)); do
+-                ifidx=$(($phyidx+$i*$radio_num))
++               if [ $phyidx -lt 2 ]; then
++                           ifidx=$(($phyidx+($i*2)))
++                elif [ $phyidx -eq 2 ]; then
++                           ifidx=$(($i+16))
++                fi
+                 ifname="$(cat /nvram/hostapd"$ifidx".conf | grep ^interface= | cut -d '=' -f2 | tr -d '\n')"
+-                vapstat="$(cat /nvram/vap-status | grep wifi"$ifidx"= | cut -d'=' -f2)"
+-                if [ -n $ifname ] && [[ $vapstat -eq "1" ]]; then
++                vapstat="$(cat /nvram/vap-status | grep wifi"$ifidx"= | cut -d'=' -f2 | head -n 1)"
++                if [ -n "$ifname" ] && [ "$vapstat" == "1" ]; then
+                     if [ $i = 0 ]; then
+                         ## first interface in this phy
+                         iw phy phy0 interface add $ifname type __ap radios $radio_idx > /dev/null
+@@ -188,9 +202,7 @@
+                     touch /nvram/hostapd-acl$ifidx
+                     touch /nvram/hostapd$ifidx.psk
+                     touch /nvram/hostapd-deny$ifidx
+-                    if [ $phyidx = $ifidx ]; then
+-                        touch /tmp/phy0-wifi$ifidx
+-                    fi
++                    touch /tmp/phy0-wifi$ifidx
+                     hostapd_cli -i global raw ADD bss_config=phy0.$radio_idx:/nvram/hostapd"$ifidx".conf
+ 		fi
+ 	    done
+@@ -213,28 +213,28 @@
+
+
+         if [ "$band" == "2g" ]; then
+-            cp -f /etc/hostapd-2G.conf /nvram/hostapd"$devidx".conf
++            cp -f /etc/hostapd-2G.conf /nvram/hostapd"$real_idx".conf
+         fi
+
+         if [ "$band" == "5g" ]; then
+             gen_vht_cap
+-            cp -f /etc/hostapd-5G.conf /nvram/hostapd"$devidx".conf
++            cp -f /etc/hostapd-5G.conf /nvram/hostapd"$real_idx".conf
+         fi
+
+         if [ "$band" == "6g" ]; then
+ 	    gen_he_6ghz_reg_pwr_type /etc/hostapd-6G.conf
+-            cp -f /etc/hostapd-6G.conf /nvram/hostapd"$devidx".conf
++            cp -f /etc/hostapd-6G.conf /nvram/hostapd"$real_idx".conf
+         fi
+
+-        sed -i "/^interface=.*/c\interface=wifi$devidx" /nvram/hostapd"$devidx".conf
+-        sed -i "/^bssid=/c\bssid=$MAC" /nvram/hostapd"$devidx".conf
+-        echo "wpa_psk_file=/nvram/hostapd$devidx.psk" >> /nvram/hostapd"$devidx".conf
+-        iw phy phy0 interface add wifi$devidx type __ap radios $radio_idx > /dev/null
+-        touch /nvram/hostapd-acl$devidx
+-        touch /nvram/hostapd$devidx.psk
+-        touch /nvram/hostapd-deny$devidx
+-        touch /tmp/phy0-wifi$devidx
+-        hostapd_cli -i global raw ADD bss_config=phy0.$radio_idx:/nvram/hostapd"$devidx".conf && echo -e "wifi"$devidx"=1" >> /nvram/vap-status
++        sed -i "/^interface=.*/c\interface=wifi$real_idx" /nvram/hostapd"$real_idx".conf
++        sed -i "/^bssid=/c\bssid=$MAC" /nvram/hostapd"$real_idx".conf
++        echo "wpa_psk_file=/nvram/hostapd$real_idx.psk" >> /nvram/hostapd"$real_idx".conf
++        iw phy phy0 interface add wifi$real_idx type __ap radios $radio_idx > /dev/null
++        touch /nvram/hostapd-acl$real_idx
++        touch /nvram/hostapd$real_idx.psk
++        touch /nvram/hostapd-deny$real_idx
++        touch /tmp/phy0-wifi$real_idx
++        hostapd_cli -i global raw ADD bss_config=phy0.$radio_idx:/nvram/hostapd"$real_idx".conf && echo -e "wifi"$real_idx"=1" >> /nvram/vap-status
+         devidx=$(($devidx + 1))
+         phyidx=$(($phyidx + 1))
+
diff --git a/meta-rdk-mtk-bpir4/recipes-wifi/hostapd/hostapd_2.11.bbappend b/meta-rdk-mtk-bpir4/recipes-wifi/hostapd/hostapd_2.11.bbappend
@@ -4,10 +4,21 @@ SRC_URI += " \
     file://hostapd-2G.conf \
     file://hostapd-5G.conf \
     file://hostapd-6G.conf \
+    file://hostapd-init-EHT.patch;apply=no \
 "
 
+do_bpi_hostapd_patch(){
+   if [ ! -f ${S}/hostapd-init-EHT.sh ]; then
+   cp ${WORKDIR}/hostapd-init-EHT.sh ${S}
+   cp ${WORKDIR}/hostapd-init-EHT.patch ${S}
+   patch -p1 ${S}/hostapd-init-EHT.sh < ${S}/hostapd-init-EHT.patch
+   fi
+}
+addtask bpi_hostapd_patch after do_patch before do_compile
+
 do_install_append() {
     install -m 755 ${WORKDIR}/hostapd-2G.conf ${D}${sysconfdir}/hostapd-2G.conf
     install -m 755 ${WORKDIR}/hostapd-5G.conf ${D}${sysconfdir}/hostapd-5G.conf
     install -m 755 ${WORKDIR}/hostapd-6G.conf ${D}${sysconfdir}/hostapd-6G.conf
+    install -m 755 ${S}/hostapd-init-EHT.sh ${D}${base_libdir}/rdk/hostapd-init.sh
 }
diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb
@@ -123,15 +123,8 @@ else # SD card image is default
         echo "Both bl2 and fip binaries are present in local workspace."
     else
         echo "**********************************************************************"
-        echo "> CAUTION: YOU ARE TRYING TO BUILD SD CARD IMAGE WITHOUT BL2 AND FIP BINARIES."
-        if [ "X$KERNEL_TYPE" == "Xkernel6-6" ]; then
-             echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2025.01/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2025.01/bpi-r4_sdmmc_fip.bin"
-        else
-             echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_fip.bin"
-	fi
-        echo "> If you don't have access to above resources, please follow instruction in https://wiki.rdkcentral.com/pages/viewpage.action?pageId=354648448#SDMonoliticimagebuildandflashingstepsforBPIR4.-Buildingbl2.imgandfip.binincaseofnothavingaccesstoartifactoryrepository to build bl2 and fip binaries yourselves."
-        echo "> Place those binaries under ${_TOPDIR}/downloads/"
-        echo "> EXITING NOW."
+        echo "> Missing files are preventing the build from starting:"
+        echo "> The BL2 and FIP binaries aren't in the downloads directory. Copy these binaries into the directory and then restart the build. You can find instructions for creating the necessary binaries on the RDK-B Code Releases page: (https://wiki.rdkcentral.com/display/CMF/RDK-B+Code+Releases)"
         echo "**********************************************************************"
         return 1
     fi

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`include ccsp_common_bananapi.inc`
	`2`	`+SRC_URI:remove = "file://filogic-factoryReset.patch"`