rebase

.github/workflows/component-release-finish-on-approval.yml

@@ -91,7 +91,14 @@ jobs:
           git checkout develop 2>/dev/null || git checkout -b develop origin/develop
           git checkout "${RELEASE_BRANCH}"
 
-          # Initialize git-flow
+          # Initialize git-flow with main as production branch
+          git config gitflow.branch.master main
+          git config gitflow.branch.develop develop
+          git config gitflow.prefix.feature feature/
+          git config gitflow.prefix.release release/
+          git config gitflow.prefix.hotfix hotfix/
+          git config gitflow.prefix.support support/
+          git config gitflow.prefix.versiontag ""
           git flow init -d
 
           # Finish release: merges to main + develop, creates tag

.github/workflows/component-release.yml

@@ -91,6 +91,13 @@ jobs:
           git checkout develop
           git reset --hard origin/develop
           git fetch origin main:main
+          git config gitflow.branch.master main
+          git config gitflow.branch.develop develop
+          git config gitflow.prefix.feature feature/
+          git config gitflow.prefix.release release/
+          git config gitflow.prefix.hotfix hotfix/
+          git config gitflow.prefix.support support/
+          git config gitflow.prefix.versiontag ""
           git flow init -d
 
       #

CHANGELOG.md

@@ -4,14 +4,40 @@ 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).
 
+#### [6.0.2](https://github.com/rdkcentral/sysint/compare/6.0.1...6.0.2)
+
+- RDKEMW-22475 : [SECVULN][7.5] Remove sensitive information from property files in /etc [`#582`](https://github.com/rdkcentral/sysint/pull/582)
+- RDKEMW-21581: Network connection recovery script should handle IPv4-only/IPv6-only networks [`#570`](https://github.com/rdkcentral/sysint/pull/570)
+- "REVERT" Sysint 4.2.1v17 hotfix release [`#587`](https://github.com/rdkcentral/sysint/pull/587)
+- 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)
+- Merge tag '4.2.1v17' into develop [`9b6cbea`](https://github.com/rdkcentral/sysint/commit/9b6cbea68938ef9f0de8a5e39990099f3bd3c938)
+- 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
+
 - 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)
+- 6.0.1 release changelog updates [`658364b`](https://github.com/rdkcentral/sysint/commit/658364b56e7ee794ff8f53b1fa88106a6e8ae007)
 - 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)