Merge branch 'develop' into rdkbaccl_1093

Author: anatar818

.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 }}

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
@@ -87,6 +90,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 +101,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/hal/files/hal-function-changes.patch

@@ -0,0 +1,67 @@
+Index: platform/rdkb_hal/src/platform/platform_hal.c
+===================================================================
+--- platform.orig/rdkb_hal/src/platform/platform_hal.c
++++ platform/rdkb_hal/src/platform/platform_hal.c
+@@ -120,8 +120,10 @@ INT platform_hal_GetSerialNumber(CHAR* p
+ 				sprintf(pValue,"%02x%02x%02x%02x%02x%02x",arr[0],arr[1],arr[2],arr[3],arr[4],arr[5]);
+ 				return RETURN_OK;
+ 			}*/
+-		       sprintf(pValue,"%s",buf);
++		        sprintf(pValue,"%s",buf);
+ 		}
++		///RDKBACCL-920
++		return RETURN_OK;
+ 	}
+ 	return RETURN_ERR;
+ 
+@@ -144,12 +146,13 @@ INT platform_hal_GetHardware(CHAR *pValu
+ 	char buf[64] = {0};
+ 	char cmd[128] = {0};
+ 
+-  
++
+ 	if (pValue == NULL)
+ 	{
+ 		return RETURN_ERR;
+ 	}
+-	snprintf(cmd,128, "cat /proc/partitions | grep mtdblock5 | awk '/mtdblock5/ {print $3}'");
++	//RDKBACCL-924
++	snprintf(cmd,128, "cat /proc/partitions | grep mtdblock4 | awk '/mtdblock4/ {print $3}'");
+ 	fp = popen(cmd,"r");
+ 	if(fp == NULL)
+ 	{
+@@ -318,13 +321,13 @@ INT platform_hal_GetModelName(CHAR* pVal
+ 	FILE *fp = NULL;
+ 	char buf[64] = {0};
+ 	int count = 0;
+-  
++
+ 	if (pValue == NULL)
+ 	{
+ 		return RETURN_ERR;
+ 	}
+ 
+-	fp = popen("cat /proc/device-tree/model","r");
++	fp = popen("cat /proc/device-tree/model | tr -d ' '","r");
+ 	if(fp == NULL)
+ 	{
+ 		return RETURN_ERR;
+@@ -384,7 +387,8 @@ INT platform_hal_GetSoftwareVersion(CHAR
+ INT platform_hal_GetFirmwareName(CHAR* pValue, ULONG maxSize)
+ {
+ 	FILE *fp;
+-	char buff[64]={0};
++//RDKBACCL-927
++	char buff[128]={0};
+   
+ 	if (pValue == NULL)
+ 	{
+@@ -397,7 +401,7 @@ INT platform_hal_GetFirmwareName(CHAR* p
+ 		return RETURN_ERR;
+ 	}
+ 
+-	while(fgets(buff, 64, fp) != NULL)
++	while(fgets(buff, 128, fp) != NULL)
+ 	{
+ 		if(strstr(buff, "imagename") != NULL)
+ 		{

meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-platform-generic_git.bbappend

@@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI_append = " file://Add_ipv6_changes.patch"
 SRC_URI_append = " file://bpi_serial_no_fix.patch"
+SRC_URI_append = " file://hal-function-changes.patch"
 
 do_configure_append() {
      #For trimming the spaces

setup-environment-refboard-rdkb

@@ -118,7 +118,11 @@ else # SD card image is default
     else
         echo "**********************************************************************"
         echo "> CAUTION: YOU ARE TRYING TO BUILD SD CARD IMAGE WITHOUT BL2 AND FIP BINARIES."
-        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"
+        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."