Skip to content

Commit 6a55994

Browse files
ap934ap934
authored
Merge branch 'develop' into populate_sdk_build_fix_6_6
2 parents e28d502 + 0ee7432 commit 6a55994

File tree

6 files changed

+133
-1
lines changed

6 files changed

+133
-1
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ do_install_append_class-target() {
5656
#SNMP SUPPORT
5757
sed -i "/tcp\:192.168.254.253\:705/a ExecStart=\/usr\/bin\/snmp_subagent \&" ${D}${systemd_unitdir}/system/snmpSubAgent.service
5858

59+
#Xdns service
60+
install -D -m 0644 ${S}/systemd_units/CcspXdnsSsp.service ${D}${systemd_unitdir}/system/CcspXdnsSsp.service
61+
5962
#Updating the checkfilogicwifisupport.service
6063
sed -i "s/forking/oneshot/g" ${D}${systemd_unitdir}/system/checkfilogicwifisupport.service
6164
sed -i "/ExecStart=/i RemainAfterExit=yes" ${D}${systemd_unitdir}/system/checkfilogicwifisupport.service
@@ -87,6 +90,7 @@ SYSTEMD_SERVICE_${PN} += "parodus.service"
8790
SYSTEMD_SERVICE_${PN} += "webpa.service"
8891
SYSTEMD_SERVICE_${PN}_remove = " utopia.service"
8992
SYSTEMD_SERVICE_${PN} += " CcspAdvSecuritySsp.service"
93+
SYSTEMD_SERVICE_${PN} += "CcspXdnsSsp.service"
9094

9195
FILES_${PN}_remove_onewifi = "${systemd_unitdir}/system/ccspwifiagent.service"
9296
FILES_${PN}_remove = "${systemd_unitdir}/system/utopia.service"
@@ -97,6 +101,7 @@ FILES_${PN}_append = " \
97101
${systemd_unitdir}/system/CcspTelemetry.service \
98102
${systemd_unitdir}/system/notifyComp.service \
99103
${systemd_unitdir}/system/gwprovapp.service \
104+
${systemd_unitdir}/system/CcspXdnsSsp.service \
100105
${systemd_unitdir}/system/gwprovapp.service.d/gwprovapp.conf \
101106
${systemd_unitdir}/system/parodus.service \
102107
${systemd_unitdir}/system/webpa.service \

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/config/RdkTelcoVoiceManager_v1.xml b/config/RdkTelcoVoiceManager_v1.xml
2+
index f07200a..b8c26d8 100644
3+
--- a/config/RdkTelcoVoiceManager_v1.xml
4+
+++ b/config/RdkTelcoVoiceManager_v1.xml
5+
@@ -61,14 +61,16 @@
6+
<name>Voice</name>
7+
<objectType>object</objectType>
8+
<functions>
9+
- <func_GetParamUlongValue>X_RDK_Report_VoiceService_GetParamUlongValue</func_GetParamUlongValue>
10+
+ <!--
11+
+ <func_GetParamUlongValue>X_RDK_Report_VoiceService_GetParamUlongValue</func_GetParamUlongValue>
12+
<func_SetParamUlongValue>X_RDK_Report_VoiceService_SetParamUlongValue</func_SetParamUlongValue>
13+
<func_GetParamStringValue>X_RDK_Report_VoiceService_GetParamStringValue</func_GetParamStringValue>
14+
<func_GetParamBoolValue>X_RDK_Report_VoiceService_GetParamBoolValue</func_GetParamBoolValue>
15+
<func_SetParamBoolValue>X_RDK_Report_VoiceService_SetParamBoolValue</func_SetParamBoolValue>
16+
<func_Validate>X_RDK_Report_VoiceService_Validate</func_Validate>
17+
<func_Commit>X_RDK_Report_VoiceService_Commit</func_Commit>
18+
- <func_Rollback>X_RDK_Report_VoiceService_Rollback</func_Rollback>
19+
+ <func_Rollback>X_RDK_Report_VoiceService_Rollback</func_Rollback>
20+
+ -->
21+
</functions>
22+
<parameters>
23+
<parameter>
24+
@@ -98,9 +100,11 @@
25+
<object>
26+
<name>Default</name>
27+
<objectType>object</objectType>
28+
- <functions>
29+
+ <functions>
30+
+ <!--
31+
<func_GetParamUlongValue>X_RDK_Report_VoiceService_Default_GetParamUlongValue</func_GetParamUlongValue>
32+
- <func_SetParamUlongValue>X_RDK_Report_VoiceService_Default_SetParamUlongValue</func_SetParamUlongValue>
33+
+ <func_SetParamUlongValue>X_RDK_Report_VoiceService_Default_SetParamUlongValue</func_SetParamUlongValue>
34+
+ -->
35+
</functions>
36+
<parameters>
37+
<parameter>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
include ccsp_common_bananapi.inc
2+
3+
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
4+
5+
SRC_URI += "file://fix_device_dm_taking_long_time.patch;apply=no "
6+
7+
do_voice_patch() {
8+
cd ${S}
9+
if [ ! -e bpi_voice_patch_applied ]; then
10+
bbnote "Patching fix_device_dm_taking_long_time.patch"
11+
patch -p1 < ${WORKDIR}/fix_device_dm_taking_long_time.patch
12+
13+
touch bpi_voice_patch_applied
14+
fi
15+
}
16+
addtask voice_patch after do_unpack before do_compile
17+
18+
INHIBIT_PACKAGE_STRIP = "1"

‎meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/hal-function-changes.patch‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
Index: platform/rdkb_hal/src/platform/platform_hal.c
2+
===================================================================
3+
--- platform.orig/rdkb_hal/src/platform/platform_hal.c
4+
+++ platform/rdkb_hal/src/platform/platform_hal.c
5+
@@ -120,8 +120,10 @@ INT platform_hal_GetSerialNumber(CHAR* p
6+
sprintf(pValue,"%02x%02x%02x%02x%02x%02x",arr[0],arr[1],arr[2],arr[3],arr[4],arr[5]);
7+
return RETURN_OK;
8+
}*/
9+
- sprintf(pValue,"%s",buf);
10+
+ sprintf(pValue,"%s",buf);
11+
}
12+
+ ///RDKBACCL-920
13+
+ return RETURN_OK;
14+
}
15+
return RETURN_ERR;
16+
17+
@@ -144,12 +146,13 @@ INT platform_hal_GetHardware(CHAR *pValu
18+
char buf[64] = {0};
19+
char cmd[128] = {0};
20+
21+
-
22+
+
23+
if (pValue == NULL)
24+
{
25+
return RETURN_ERR;
26+
}
27+
- snprintf(cmd,128, "cat /proc/partitions | grep mtdblock5 | awk '/mtdblock5/ {print $3}'");
28+
+ //RDKBACCL-924
29+
+ snprintf(cmd,128, "cat /proc/partitions | grep mtdblock4 | awk '/mtdblock4/ {print $3}'");
30+
fp = popen(cmd,"r");
31+
if(fp == NULL)
32+
{
33+
@@ -318,13 +321,13 @@ INT platform_hal_GetModelName(CHAR* pVal
34+
FILE *fp = NULL;
35+
char buf[64] = {0};
36+
int count = 0;
37+
-
38+
+
39+
if (pValue == NULL)
40+
{
41+
return RETURN_ERR;
42+
}
43+
44+
- fp = popen("cat /proc/device-tree/model","r");
45+
+ fp = popen("cat /proc/device-tree/model | tr -d ' '","r");
46+
if(fp == NULL)
47+
{
48+
return RETURN_ERR;
49+
@@ -384,7 +387,8 @@ INT platform_hal_GetSoftwareVersion(CHAR
50+
INT platform_hal_GetFirmwareName(CHAR* pValue, ULONG maxSize)
51+
{
52+
FILE *fp;
53+
- char buff[64]={0};
54+
+//RDKBACCL-927
55+
+ char buff[128]={0};
56+
57+
if (pValue == NULL)
58+
{
59+
@@ -397,7 +401,7 @@ INT platform_hal_GetFirmwareName(CHAR* p
60+
return RETURN_ERR;
61+
}
62+
63+
- while(fgets(buff, 64, fp) != NULL)
64+
+ while(fgets(buff, 128, fp) != NULL)
65+
{
66+
if(strstr(buff, "imagename") != NULL)
67+
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
22

33
SRC_URI_append = " file://Add_ipv6_changes.patch"
44
SRC_URI_append = " file://bpi_serial_no_fix.patch"
5+
SRC_URI_append = " file://hal-function-changes.patch"
56

67
do_configure_append() {
78
#For trimming the spaces

‎setup-environment-refboard-rdkb‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@ else # SD card image is default
119119
else
120120
echo "**********************************************************************"
121121
echo "> CAUTION: YOU ARE TRYING TO BUILD SD CARD IMAGE WITHOUT BL2 AND FIP BINARIES."
122-
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"
122+
if [ "X$KERNEL_TYPE" == "Xkernel6-6" ]; then
123+
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"
124+
else
125+
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"
126+
fi
123127
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."
124128
echo "> Place those binaries under ${_TOPDIR}/downloads/"
125129
echo "> EXITING NOW."

0 commit comments

Comments
 (0)