From d9ba26153f279a13bac3a626d45ab1d6b42e510f Mon Sep 17 00:00:00 2001
From: gsanto722 <grandhi_santoshkumar@comcast.com>
Date: Tue, 12 Nov 2024 08:22:54 +0000
Subject: [PATCH 1/9] RDK-51777: Remove irmgr reference from rdkservices and
 rdkservices-cpc

Reason for change: Remove irmgr reference from rdkservices and rdkservices-cpc
Test Procedure: refer RDK-51769.
Risks: Low
Signed-off-by:gsanto722 <grandhi_santoshkumar@comcast.com>
---
 DisplaySettings/DisplaySettings.h           | 1 -
 DisplaySettings/cmake/FindIARMBus.cmake     | 5 ++---
 FrameRate/cmake/FindIARMBus.cmake           | 5 ++---
 MaintenanceManager/MaintenanceManager.h     | 1 -
 MaintenanceManager/cmake/FindIARMBus.cmake  | 5 ++---
 RemoteActionMapping/CMakeLists.txt          | 2 --
 RemoteActionMapping/cmake/FindIARMBus.cmake | 6 +++---
 SystemServices/cmake/FindIARMBus.cmake      | 5 ++---
 Warehouse/cmake/FindIARMBus.cmake           | 1 -
 cmake/FindIARMBus.cmake                     | 5 ++---
 l1tests.cmake                               | 1 -
 11 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/DisplaySettings/DisplaySettings.h b/DisplaySettings/DisplaySettings.h
index da59cd9fc1..5ddea3a11e 100644
--- a/DisplaySettings/DisplaySettings.h
+++ b/DisplaySettings/DisplaySettings.h
@@ -25,7 +25,6 @@
 #include "dsTypes.h"
 #include "tptimer.h"
 #include "libIARM.h"
-#include "irMgr.h"
 #include "pwrMgr.h"
 #include "rfcapi.h"
 #include <interfaces/ISystemMode.h>
diff --git a/DisplaySettings/cmake/FindIARMBus.cmake b/DisplaySettings/cmake/FindIARMBus.cmake
index 9764ced5ea..f4554b1555 100644
--- a/DisplaySettings/cmake/FindIARMBus.cmake
+++ b/DisplaySettings/cmake/FindIARMBus.cmake
@@ -27,11 +27,10 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS})
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS})
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
 
 
 include(FindPackageHandleStandardArgs)
diff --git a/FrameRate/cmake/FindIARMBus.cmake b/FrameRate/cmake/FindIARMBus.cmake
index cad92b7305..7d32a1ba0a 100644
--- a/FrameRate/cmake/FindIARMBus.cmake
+++ b/FrameRate/cmake/FindIARMBus.cmake
@@ -27,13 +27,12 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
 find_path(IARMRECEIVER_INCLUDE_DIRS NAMES receiverMgr.h PATH_SUFFIXES rdk/iarmmgrs/receiver)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS})
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS})
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)
diff --git a/MaintenanceManager/MaintenanceManager.h b/MaintenanceManager/MaintenanceManager.h
index 695d91a24d..554bdd8a0f 100644
--- a/MaintenanceManager/MaintenanceManager.h
+++ b/MaintenanceManager/MaintenanceManager.h
@@ -28,7 +28,6 @@
 #include "tracing/Logging.h"
 #if defined(USE_IARMBUS) || defined(USE_IARM_BUS)
 #include "libIARM.h"
-#include "irMgr.h"
 #include "pwrMgr.h"
 #include "maintenanceMGR.h" /* IARM INTERFACE HELPER */
 #endif /* USE_IARMBUS || USE_IARM_BUS */
diff --git a/MaintenanceManager/cmake/FindIARMBus.cmake b/MaintenanceManager/cmake/FindIARMBus.cmake
index 2b60f4e31f..9050971a62 100644
--- a/MaintenanceManager/cmake/FindIARMBus.cmake
+++ b/MaintenanceManager/cmake/FindIARMBus.cmake
@@ -27,14 +27,13 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
 find_path(IARMSYS_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} )
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS}  CACHE PATH "Path to IARMBus include")
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} )
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS}  CACHE PATH "Path to IARMBus include")
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)
diff --git a/RemoteActionMapping/CMakeLists.txt b/RemoteActionMapping/CMakeLists.txt
index 2d5a3fbf43..a8587c07a2 100644
--- a/RemoteActionMapping/CMakeLists.txt
+++ b/RemoteActionMapping/CMakeLists.txt
@@ -47,8 +47,6 @@ if (CTRLM_FOUND)
     target_include_directories(${MODULE_NAME} PRIVATE ${CTRLM_INCLUDE_DIRS})
     find_package(IARMBus)
     target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS})
-    find_package(IRMGR)
-    target_include_directories(${MODULE_NAME} PRIVATE ${IRMGR_INCLUDE_DIRS})
     target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES})
 else (CTRLM_FOUND)
     target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
diff --git a/RemoteActionMapping/cmake/FindIARMBus.cmake b/RemoteActionMapping/cmake/FindIARMBus.cmake
index 212699aac4..9b25431324 100644
--- a/RemoteActionMapping/cmake/FindIARMBus.cmake
+++ b/RemoteActionMapping/cmake/FindIARMBus.cmake
@@ -27,11 +27,11 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IRMGR_INCLUDE_DIRS NAMES irMgr.h comcastIrKeyCodes.h PATH_SUFFIXES rdk/iarmmgrs/ir rdk/iarmmgrs-hal)
+find_path(IRMGR_INCLUDE_DIRS NAMES comcastIrKeyCodes.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IRMGR_INCLUDE_DIRS})
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IRMGR_INCLUDE_DIRS} CACHE PATH "Paths to IARMBus include")
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS})
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} CACHE PATH "Paths to IARMBus include")
 
 
 include(FindPackageHandleStandardArgs)
diff --git a/SystemServices/cmake/FindIARMBus.cmake b/SystemServices/cmake/FindIARMBus.cmake
index d18eb98042..92864e6be3 100644
--- a/SystemServices/cmake/FindIARMBus.cmake
+++ b/SystemServices/cmake/FindIARMBus.cmake
@@ -27,14 +27,13 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
 find_path(IARMSYS_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} )
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS}  CACHE PATH "Path to IARMBus include")
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} )
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS}  CACHE PATH "Path to IARMBus include")
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)
diff --git a/Warehouse/cmake/FindIARMBus.cmake b/Warehouse/cmake/FindIARMBus.cmake
index e6ee482545..65cce72e45 100644
--- a/Warehouse/cmake/FindIARMBus.cmake
+++ b/Warehouse/cmake/FindIARMBus.cmake
@@ -27,7 +27,6 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 #find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-#find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
 find_path(IARMIR_INCLUDE_DIRS NAMES sysMgr.h PATH_SUFFIXES rdk/iarmmgrs/sysmgr)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
diff --git a/cmake/FindIARMBus.cmake b/cmake/FindIARMBus.cmake
index cad92b7305..7d32a1ba0a 100644
--- a/cmake/FindIARMBus.cmake
+++ b/cmake/FindIARMBus.cmake
@@ -27,13 +27,12 @@ find_package(PkgConfig)
 
 find_library(IARMBUS_LIBRARIES NAMES IARMBus)
 find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
-find_path(IARMIR_INCLUDE_DIRS NAMES irMgr.h PATH_SUFFIXES rdk/iarmmgrs/ir)
 find_path(IARMRECEIVER_INCLUDE_DIRS NAMES receiverMgr.h PATH_SUFFIXES rdk/iarmmgrs/receiver)
 find_path(IARMPWR_INCLUDE_DIRS NAMES pwrMgr.h PATH_SUFFIXES rdk/iarmmgrs-hal)
 
 set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS})
-set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMIR_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS})
+set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMPWR_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)
diff --git a/l1tests.cmake b/l1tests.cmake
index 63654c3c7c..3352bbb667 100755
--- a/l1tests.cmake
+++ b/l1tests.cmake
@@ -100,7 +100,6 @@ set(EMPTY_HEADERS
         ${BASEDIR}/rtNotifier.h
 	${BASEDIR}/dsRpc.h
 	${BASEDIR}/websocket/URL.h
-        ${BASEDIR}/rdk/iarmmgrs/irMgr.h
         ${BASEDIR}/rdk/iarmmgrs/comcastIrKeyCodes.h
 	    ${BASEDIR}/rdk_logger_milestone.h
 	    ${BASEDIR}/opkg/opkg.h

From b9baa755e9fce6e5b02c29fe8169c75a158ad519 Mon Sep 17 00:00:00 2001
From: gsanto722 <grandhi_santoshkumar@comcast.com>
Date: Wed, 18 Dec 2024 09:23:02 +0000
Subject: [PATCH 2/9] RDK-51777: [RDK-V]remove irmgr reference from rdkservices
 and rdkservices-cpc

Reason for change: [RDK-V]remove irmgr reference from rdkservices and rdkservices-cpc
Test Procedure: refer RDK-51769.
Risks: Low
Signed-off-by:gsanto722 <grandhi_santoshkumar@comcast.com>
---
 DisplaySettings/DisplaySettings.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DisplaySettings/DisplaySettings.h b/DisplaySettings/DisplaySettings.h
index 5ddea3a11e..0b6319ef64 100644
--- a/DisplaySettings/DisplaySettings.h
+++ b/DisplaySettings/DisplaySettings.h
@@ -32,6 +32,7 @@
 #include <iostream>
 #include <fstream>
 
+
 namespace WPEFramework {
 
     namespace Plugin {

From 7e15fcd3748ff554f3eb0ed07e963bdd05faa4fc Mon Sep 17 00:00:00 2001
From: gsanto722 <grandhi_santoshkumar@comcast.com>
Date: Wed, 18 Dec 2024 09:32:40 +0000
Subject: [PATCH 3/9] RDK-51777: [RDK-V]remove irmgr reference from rdkservices
 and rdkservices-cpc

Reason for change: [RDK-V]remove irmgr reference from rdkservices and rdkservices-cpc
Test Procedure: refer RDK-51769.
Risks: Low
Signed-off-by:gsanto722 <grandhi_santoshkumar@comcast.com>
---
 DisplaySettings/CHANGELOG.md     | 4 ++++
 FrameRate/CHANGELOG.md           | 4 ++++
 MaintenanceManager/CHANGELOG.md  | 4 ++++
 RemoteActionMapping/CHANGELOG.md | 5 +++++
 SystemServices/CHANGELOG.md      | 4 ++++
 Warehouse/CHANGELOG.md           | 4 ++++
 6 files changed, 25 insertions(+)

diff --git a/DisplaySettings/CHANGELOG.md b/DisplaySettings/CHANGELOG.md
index 4f0195c5c3..563a958010 100644
--- a/DisplaySettings/CHANGELOG.md
+++ b/DisplaySettings/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [2.0.2] - 2024-12-18
+### Removed
+- remove irmgr reference from rdkservices.
+
 ## [2.0.1] - 2024-12-03
 ### Fixed
 - Fixed unhandled exception that was occasionally causing a crash if thread creation failed.
diff --git a/FrameRate/CHANGELOG.md b/FrameRate/CHANGELOG.md
index b9aed29794..241b4173ae 100644
--- a/FrameRate/CHANGELOG.md
+++ b/FrameRate/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [1.0.7] - 2024-12-18
+### Removed
+- remove irmgr reference from rdkservices.
+
 ## [1.0.6] - 2024-05-25
 ### Added
 - Make plugin autostart configurable from recipe
diff --git a/MaintenanceManager/CHANGELOG.md b/MaintenanceManager/CHANGELOG.md
index 6ab8de306b..c2d8effadb 100644
--- a/MaintenanceManager/CHANGELOG.md
+++ b/MaintenanceManager/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [1.0.39] - 2024-12-18
+### Removed
+- remove irmgr reference from rdkservices.
+
 ## [1.0.38] - 2024-11-26
 ### Added
 - MaintenanceManager is stuck at MAINTENANCE_STARTED in non-WAI case, when SUPPRESSED_MAINTENANCE is enabled with no Skip Firmware
diff --git a/RemoteActionMapping/CHANGELOG.md b/RemoteActionMapping/CHANGELOG.md
index 324bbe618e..ebd6735528 100644
--- a/RemoteActionMapping/CHANGELOG.md
+++ b/RemoteActionMapping/CHANGELOG.md
@@ -15,6 +15,11 @@ All notable changes to this RDK Service will be documented in this file.
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
+
+## [1.0.9] - 2024-12-18
+### Removed
+- remove irmgr reference from rdkservices.
+
 ## [1.0.8] - 2024-03-29
 ### Security
 - Resolved security vulnerabilities
diff --git a/SystemServices/CHANGELOG.md b/SystemServices/CHANGELOG.md
index e48c10098e..eaf09842eb 100644
--- a/SystemServices/CHANGELOG.md
+++ b/SystemServices/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [3.4.1] - 2024-12-18
+### Removed
+- remove irmgr reference from rdkservices.
+
 ## [3.4.0] - 2024-12-09
 ### Added
 - Added implementation for BootType get API.
diff --git a/Warehouse/CHANGELOG.md b/Warehouse/CHANGELOG.md
index b4d1dbf9d9..6cf2825716 100644
--- a/Warehouse/CHANGELOG.md
+++ b/Warehouse/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [1.0.11] - 2024-12-18
+### Removed
+- remove irmgr reference from rdkservices
+
 ## [1.0.10] - 2024-05-25
 ### Added
 - Make plugin autostart configurable from recipe

From ba73e7ba53eeca4e49282cd5e826fadf093c750d Mon Sep 17 00:00:00 2001
From: gsanto722 <grandhi_santoshkumar@comcast.com>
Date: Sun, 29 Dec 2024 12:48:14 +0000
Subject: [PATCH 4/9] RDK-51777: [RDK-V]remove irmgr reference from rdkservices
 and rdkservices-cpc

Reason for change: remove irmgr reference from rdkservices and rdkservices-cpc
Test Procedure: check power state related test cases.
Risks: Low
Signed-off-by:gsanto722 <grandhi_santoshkumar@comcast.com>
---
 DisplaySettings/CHANGELOG.md | 3 ---
 SystemServices/CHANGELOG.md  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/DisplaySettings/CHANGELOG.md b/DisplaySettings/CHANGELOG.md
index 563a958010..59fdd0d1bb 100644
--- a/DisplaySettings/CHANGELOG.md
+++ b/DisplaySettings/CHANGELOG.md
@@ -16,9 +16,6 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
-## [2.0.2] - 2024-12-18
-### Removed
-- remove irmgr reference from rdkservices.
 
 ## [2.0.1] - 2024-12-03
 ### Fixed
diff --git a/SystemServices/CHANGELOG.md b/SystemServices/CHANGELOG.md
index eaf09842eb..3977172b67 100644
--- a/SystemServices/CHANGELOG.md
+++ b/SystemServices/CHANGELOG.md
@@ -16,9 +16,6 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
-## [3.4.1] - 2024-12-18
-### Removed
-- remove irmgr reference from rdkservices.
 
 ## [3.4.0] - 2024-12-09
 ### Added

From 4fae5ca0df544f7b608e4ccd0f658e3e242a9c3a Mon Sep 17 00:00:00 2001
From: gsanto722 <grandhi_santoshkumar@comcast.com>
Date: Sun, 29 Dec 2024 12:50:45 +0000
Subject: [PATCH 5/9] RDK-51777: [RDK-V]remove irmgr reference from rdkservices
 and rdkservices-cpc

Reason for change: remove irmgr reference from rdkservices and rdkservices-cpc
Test Procedure: check power state related test cases.
Risks: Low
Signed-off-by:gsanto722 <grandhi_santoshkumar@comcast.com>
---
 DisplaySettings/CHANGELOG.md | 1 -
 SystemServices/CHANGELOG.md  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/DisplaySettings/CHANGELOG.md b/DisplaySettings/CHANGELOG.md
index 59fdd0d1bb..4f0195c5c3 100644
--- a/DisplaySettings/CHANGELOG.md
+++ b/DisplaySettings/CHANGELOG.md
@@ -16,7 +16,6 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
-
 ## [2.0.1] - 2024-12-03
 ### Fixed
 - Fixed unhandled exception that was occasionally causing a crash if thread creation failed.
diff --git a/SystemServices/CHANGELOG.md b/SystemServices/CHANGELOG.md
index 3977172b67..e48c10098e 100644
--- a/SystemServices/CHANGELOG.md
+++ b/SystemServices/CHANGELOG.md
@@ -16,7 +16,6 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
-
 ## [3.4.0] - 2024-12-09
 ### Added
 - Added implementation for BootType get API.

From 884544e896e7fd346b4e8a358fcb8033a75e3d01 Mon Sep 17 00:00:00 2001
From: gsanto722 <grandhi_santoshkumar@comcast.com>
Date: Sun, 29 Dec 2024 12:55:15 +0000
Subject: [PATCH 6/9] RDK-51777: [RDK-V]remove irmgr reference from rdkservices
 and rdkservices-cpc

Reason for change: remove irmgr reference from rdkservices and rdkservices-cpc
Test Procedure: check power state related test cases.
Risks: Low
Signed-off-by:gsanto722 <grandhi_santoshkumar@comcast.com>
---
 DisplaySettings/CHANGELOG.md | 4 ++++
 SystemServices/CHANGELOG.md  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/DisplaySettings/CHANGELOG.md b/DisplaySettings/CHANGELOG.md
index 4f0195c5c3..1ef38107dd 100644
--- a/DisplaySettings/CHANGELOG.md
+++ b/DisplaySettings/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [2.0.2] - 2024-12-29
+### Removed
+- Removed irmgr references from rdkservices.
+
 ## [2.0.1] - 2024-12-03
 ### Fixed
 - Fixed unhandled exception that was occasionally causing a crash if thread creation failed.
diff --git a/SystemServices/CHANGELOG.md b/SystemServices/CHANGELOG.md
index e48c10098e..ce81acbdc4 100644
--- a/SystemServices/CHANGELOG.md
+++ b/SystemServices/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [2.4.1] - 2024-12-29
+### Removed
+- Removed irmgr references from rdkservices.
+
 ## [3.4.0] - 2024-12-09
 ### Added
 - Added implementation for BootType get API.

From c1e4e4faf8da9a77652f4ed24f148b21097f9505 Mon Sep 17 00:00:00 2001
From: apatel859 <48992974+apatel859@users.noreply.github.com>
Date: Mon, 30 Dec 2024 09:07:49 -0500
Subject: [PATCH 7/9] Update CHANGELOG.md

---
 SystemServices/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SystemServices/CHANGELOG.md b/SystemServices/CHANGELOG.md
index abc09d87d7..6f38264ae7 100644
--- a/SystemServices/CHANGELOG.md
+++ b/SystemServices/CHANGELOG.md
@@ -16,7 +16,7 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
-## [2.4.2] - 2024-12-29
+## [3.4.2] - 2024-12-29
 ### Removed
 - Removed irmgr references from rdkservices.
 

From 7e147a6207294423d50811f4bf7f15a1560a4254 Mon Sep 17 00:00:00 2001
From: gsanto722 <grandhi_santoshkumar@comcast.com>
Date: Mon, 30 Dec 2024 14:27:21 +0000
Subject: [PATCH 8/9] RDK-51777: [RDK-V]remove irmgr reference from rdkservices
 and rdkservices-cpc

Reason for change: remove irmgr reference from rdkservices and rdkservices-cpc
Test Procedure: check power state related test cases.
Risks: Low
Signed-off-by:gsanto722 <grandhi_santoshkumar@comcast.com>
---
 SystemServices/SystemServices.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SystemServices/SystemServices.cpp b/SystemServices/SystemServices.cpp
index 06086ea7af..d2371cb2b9 100644
--- a/SystemServices/SystemServices.cpp
+++ b/SystemServices/SystemServices.cpp
@@ -67,7 +67,7 @@ using namespace std;
 
 #define API_VERSION_NUMBER_MAJOR 3
 #define API_VERSION_NUMBER_MINOR 4
-#define API_VERSION_NUMBER_PATCH 1
+#define API_VERSION_NUMBER_PATCH 2
 
 #define MAX_REBOOT_DELAY 86400 /* 24Hr = 86400 sec */
 #define TR181_FW_DELAY_REBOOT "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.AutoReboot.fwDelayReboot"

From bb5336df535d2e4531ac76ed8eece99236f0b254 Mon Sep 17 00:00:00 2001
From: gsanto722 <grandhi_santoshkumar@comcast.com>
Date: Mon, 30 Dec 2024 15:22:57 +0000
Subject: [PATCH 9/9] RDK-51777: [RDK-V]remove irmgr reference from rdkservices
 and rdkservices-cpc

Reason for change: remove irmgr reference from rdkservices and rdkservices-cpc
Test Procedure: check power state related test cases.
Risks: Low
Signed-off-by:gsanto722 <grandhi_santoshkumar@comcast.com>
---
 DisplaySettings/DisplaySettings.cpp         | 2 +-
 FrameRate/FrameRate.cpp                     | 2 +-
 MaintenanceManager/MaintenanceManager.cpp   | 2 +-
 RemoteActionMapping/RemoteActionMapping.cpp | 2 +-
 Warehouse/Warehouse.cpp                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DisplaySettings/DisplaySettings.cpp b/DisplaySettings/DisplaySettings.cpp
index 9f4a4ae25c..098f9702a0 100644
--- a/DisplaySettings/DisplaySettings.cpp
+++ b/DisplaySettings/DisplaySettings.cpp
@@ -85,7 +85,7 @@ using namespace std;
 
 #define API_VERSION_NUMBER_MAJOR 2
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 2
+#define API_VERSION_NUMBER_PATCH 3
 
 static bool isCecEnabled = false;
 static bool isResCacheUpdated = false;
diff --git a/FrameRate/FrameRate.cpp b/FrameRate/FrameRate.cpp
index 21c21a8c02..b3b13452d8 100644
--- a/FrameRate/FrameRate.cpp
+++ b/FrameRate/FrameRate.cpp
@@ -51,7 +51,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 6
+#define API_VERSION_NUMBER_PATCH 7
 
 namespace WPEFramework
 {
diff --git a/MaintenanceManager/MaintenanceManager.cpp b/MaintenanceManager/MaintenanceManager.cpp
index 5527f602ce..c7cec3513e 100644
--- a/MaintenanceManager/MaintenanceManager.cpp
+++ b/MaintenanceManager/MaintenanceManager.cpp
@@ -68,7 +68,7 @@ using namespace std;
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 36
+#define API_VERSION_NUMBER_PATCH 39
 #define SERVER_DETAILS  "127.0.0.1:9998"
 
 
diff --git a/RemoteActionMapping/RemoteActionMapping.cpp b/RemoteActionMapping/RemoteActionMapping.cpp
index 5920d0e3ac..0d0a12cb8c 100644
--- a/RemoteActionMapping/RemoteActionMapping.cpp
+++ b/RemoteActionMapping/RemoteActionMapping.cpp
@@ -77,7 +77,7 @@ const int supported_irrfdb_slots_size = sizeof(supported_irrfdb_slots) / sizeof(
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 8
+#define API_VERSION_NUMBER_PATCH 9
 
 using namespace std;
 
diff --git a/Warehouse/Warehouse.cpp b/Warehouse/Warehouse.cpp
index 97a4e2e59d..586d2493d7 100644
--- a/Warehouse/Warehouse.cpp
+++ b/Warehouse/Warehouse.cpp
@@ -86,7 +86,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 10
+#define API_VERSION_NUMBER_PATCH 11
 
 namespace Utils {
 std::string formatIARMResult(IARM_Result_t result)