rebase

CHANGELOG.md

@@ -4,45 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-<<<<<<< HEAD
 #### [6.0.1](https://github.com/rdkcentral/sysint/compare/6.0.0...6.0.1)
 
-=======
-#### [4.2.1v17](https://github.com/rdkcentral/sysint/compare/6.0.1...4.2.1v17)
-
-- RDKEMW-21582: Network connection recovery script should handle IPv4-only/IPv6-only networks [`#581`](https://github.com/rdkcentral/sysint/pull/581)
-- RDKEMW-19100:gst-cleanup conditions when cdl_flashed_file_name is not present [`#551`](https://github.com/rdkcentral/sysint/pull/551)
-- RDKEMW-18972 :  RebootReason log adds colon in the Parodus.log file [`#550`](https://github.com/rdkcentral/sysint/pull/550)
-- RDKEMW-16152: "Let's get connected" screen displayed during Migration testing [`#549`](https://github.com/rdkcentral/sysint/pull/549)
-- RDKEMW-18793a: avoid thermal call in deepsleep [`#548`](https://github.com/rdkcentral/sysint/pull/548)
-- RDKEMW-17533 : [support/8.4.4.0] OCDM_WVMediaKey and OCDM_SaThread changes in sysint [`#518`](https://github.com/rdkcentral/sysint/pull/518)
-- RDKEMW-17274: 8.4 T2 event for MemAvailable Need To Send Only Numerical Value [`#515`](https://github.com/rdkcentral/sysint/pull/515)
-- RDKEMW-15318: [4.2.1] stop ctrlm-main service before bluez for graceful reboot [`#486`](https://github.com/rdkcentral/sysint/pull/486)
-- [RDKEMW-14555] : Updating wifi reassociation threshould tolerance RFC [`#462`](https://github.com/rdkcentral/sysint/pull/462)
-- Hotfix 4.2.1v8 [`#475`](https://github.com/rdkcentral/sysint/pull/475)
-- RDKEMW-13932: Move Bluetooth Mac update from Device Details to Bluetooth Service [`#458`](https://github.com/rdkcentral/sysint/pull/458)
--  RDKEMW-13691: Increase Timeout for NTP PartnerURL Read  [`#456`](https://github.com/rdkcentral/sysint/pull/456)
-- RDKEMW-13425: Remove monarch process name for core upload [`#452`](https://github.com/rdkcentral/sysint/pull/452)
-- RDKEMW-13061: Include utility indepenent of T2 for telemetry upload [`#443`](https://github.com/rdkcentral/sysint/pull/443)
-- sysint 4.2.1 hotfix release [`35cd500`](https://github.com/rdkcentral/sysint/commit/35cd5003a10a61c13830955014d04822d952f104)
-- Sysint 4.2.1 hotfix release [`c542d88`](https://github.com/rdkcentral/sysint/commit/c542d88c469198d0d7c5b55503635a88697beaa3)
-- Sysint 4.2.1v13 hotfix release [`27c5acd`](https://github.com/rdkcentral/sysint/commit/27c5acd0f90ce3cacb99383139d441289f56526f)
-
-#### [6.0.1](https://github.com/rdkcentral/sysint/compare/6.0.0...6.0.1)
-
-> 20 July 2026
-
->>>>>>> 4.2.1v17
 - RDKE-1065: Automated workflow - create pull request to main instead of develop [`#572`](https://github.com/rdkcentral/sysint/pull/572)
 - RDKEMW-20916 : [RDKE] [Develop] RDKV-to-RDKE Migration: Unexpected Network Connectivity Prior to Migration Completion [`#571`](https://github.com/rdkcentral/sysint/pull/571)
 - RDKEMW-10439: Reboot device with WareHouse plugin resetDevice [`#381`](https://github.com/rdkcentral/sysint/pull/381)
 - RDKEMW-21159: avoid thermal call in deepsleep (#548) [`#566`](https://github.com/rdkcentral/sysint/pull/566)
 - RDKE-1065: Automated Component release workflow [`#562`](https://github.com/rdkcentral/sysint/pull/562)
 - RDKE-1065: Using ubuntu-latest runner for release workflow [`#557`](https://github.com/rdkcentral/sysint/pull/557)
-<<<<<<< HEAD
-=======
-- 6.0.1 release changelog updates [`658364b`](https://github.com/rdkcentral/sysint/commit/658364b56e7ee794ff8f53b1fa88106a6e8ae007)
->>>>>>> 4.2.1v17
 - Merge tag '6.0.0' into develop [`e96c345`](https://github.com/rdkcentral/sysint/commit/e96c34560bc16714dec958463ebf64772902f45d)
 
 ### [6.0.0](https://github.com/rdkcentral/sysint/compare/5.1.0...6.0.0)

etc/common.properties

@@ -25,13 +25,8 @@ REBOOT_INTERVAL=36
 DEFAULT_IP=192.168.100.10
 PROXY_FILE="/opt/persistent/usr/1112/703e/proxy-is-up"
 LOG_PATH=/var/log
-CRASH_SVR=10.252.186.187
-DEFAULT_PROXY_IP=10.253.96.38
 DEFAULT_PROXY_PORT=8080
-CDL_SERVER=10.253.97.212:8080
-IMAGE_SERVER=10.253.97.212
 POTOMAC_SVR=69.252.107.55
-TFTP_SVR=10.253.97.214
 DUMP_EXTN=core.prog*
 PERF_TEST=1
 BUILD_VERSION=33.33.33p33d15_EXP

etc/config.properties

@@ -19,21 +19,11 @@
 
 
 # coredump upload settings
-CRASH_SVR=10.252.186.187
 PORTAL_URL=
 POTOMAC_USER=ccpstbscp
 POTOMAC_IDENTITY_FILE=/.ssh/id_dropbear
 CRASH_PORTAL_PATH="/opt/crashportal_uploads/coredumps/"
 CRASH_SERVER_COREDUMP_PORT=2199
-CRASH_SERVER_COREDUMP_USER=coredumps_upload
-CRASH_SERVER_COREDUMP_PASS=coredumps_upload
 CRASH_SERVER_MINIDUMP_PORT=2199
-CRASH_SERVER_MINIDUMP_USER=minidumps_upload
-CRASH_SERVER_MINIDUMP_PASS=minidumps_upload
 POTOMAC_SVR=69.252.107.55
-TFTP_SVR=10.253.97.249
 
-# DCM & Log upload settings
-LOG_SERVER=10.253.97.249
-DCM_LOG_SERVER=10.253.97.249
-DCM_LOG_SERVER_URL=10.253.97.249

lib/rdk/Start_MaintenanceTasks.sh

@@ -98,6 +98,7 @@ runMaintenanceRFCTask()
         rfcLog "No RFC Bin/ Script"
         result=-1
     fi
+    touch /tmp/.RFCsynccomplete
     # Handle both success (0) and acceptable warning (1) exit codes, flag other results as errors
     if [ "$result" -ne 0 ] && [ "$result" -ne 1 ]; then
         eventSender "MaintenanceMGR" "$MAINT_RFC_ERROR"

lib/rdk/core_shell.sh

@@ -335,11 +335,7 @@ if  [ "$1" = "xcal-discovery-" ] || [ "$1" = "xdiscovery" ] || [ "$1" = "IARMDae
     [ "$1" = "NWMgrPlugin" ] || [ "$1" = "nm_event_thrd" ] ||
     [ "$1" = "Monitor::IResou" ] || [ "$1" = "DRMSYSTEM" ] || [ "$1" = "HTTPREQUEST_MAN" ] ||
     [ "$1" = "civetweb-worker" ] || [ "$1" = "nfrtool" ] ||
-<<<<<<< HEAD
     [ "$1" = "OCDM_WVMediaKey" ] || [ "$1" = "OCDM_SaThread" ] || [ "$1" = "multiqueue28:sr" ]; then
-=======
-    [ "$1" = "OCDM_WVMediaKey" ] || [ "$1" = "OCDM_SaThread" ]; then
->>>>>>> 4.2.1v17
         dumpFile
         exit 0
 fi

lib/rdk/getDeviceDetails.sh

@@ -285,11 +285,7 @@ getBluetoothMac()
     if [ -f /lib/rdk/readBTAddress-vendor.sh ]; then
         bluetooth_mac=`sh /lib/rdk/readBTAddress-vendor.sh`
     else
-<<<<<<< HEAD
         bluetooth_mac=`sh /lib/rdk/readBTAddress-generic.sh`
-=======
-        bluetooth_mac=`sh /lib/rdk/readBTAddress-generic.sh`    
->>>>>>> 4.2.1v17
     fi
 
     echo "$bluetooth_mac"