Skip to content

RDKEMW-4196: Cleanup and remove pwrmgr references from workflows #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/L1-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ jobs:
rdk/iarmbus/libIBusDaemon.h
rdk/halif/deepsleep-manager/deepSleepMgr.h
rdk/iarmmgrs-hal/mfrMgr.h
rdk/iarmmgrs-hal/pwrMgr.h
rdk/iarmmgrs-hal/sysMgr.h
network/wifiSrvMgrIarmIf.h
network/netsrvmgrIarm.h
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/L2-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ jobs:
rdk/iarmbus/libIBus.h
rdk/iarmbus/libIBusDaemon.h
rdk/iarmmgrs-hal/mfrMgr.h
rdk/iarmmgrs-hal/pwrMgr.h
rdk/iarmmgrs-hal/sysMgr.h
rdk/iarmbus/iarmUtil.h
rfcapi.h
Expand Down
1 change: 0 additions & 1 deletion MaintenanceManager/MaintenanceManager.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**

Check failure on line 1 in MaintenanceManager/MaintenanceManager.h

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'MaintenanceManager/MaintenanceManager.h' (Match: rdkcentral/rdkservices/1, 315 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: MaintenanceManager/MaintenanceManager.h)
* If not stated otherwise in this file or this component's LICENSE
* file the following copyright and licenses apply:
*
Expand Down Expand Up @@ -31,7 +31,6 @@
#include "tracing/Logging.h"
#if defined(USE_IARMBUS) || defined(USE_IARM_BUS)
#include "libIARM.h"
#include "pwrMgr.h"
#include "maintenanceMGR.h" /* IARM INTERFACE HELPER */
#endif /* USE_IARMBUS || USE_IARM_BUS */

Expand Down
6 changes: 3 additions & 3 deletions MaintenanceManager/cmake/FindIARMBus.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# If not stated otherwise in this file or this component's license file the

Check failure on line 1 in MaintenanceManager/cmake/FindIARMBus.cmake

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'MaintenanceManager/cmake/FindIARMBus.cmake' (Match: rdkcentral/rdkservices/1, 45 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: MaintenanceManager/cmake/FindIARMBus.cmake)
# following copyright and licenses apply:
#
# Copyright 2021 RDK Management
Expand Down Expand Up @@ -28,12 +28,12 @@
find_library(IARMBUS_LIBRARIES NAMES IARMBus)
find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
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)
find_path(IARMMAINTEN_INCLUDE_DIRS NAMES maintenanceMGR.h PATH_SUFFIXES rdk/iarmmgrs-hal)


set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
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")
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMMAINTEN_INCLUDE_DIRS})
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMSYS_INCLUDE_DIRS} ${IARMMAINTEN_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)
Expand Down
1 change: 0 additions & 1 deletion build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ touch rdk/iarmbus/libIBus.h
touch rdk/iarmbus/libIBusDaemon.h
touch rdk/halif/deepsleep-manager/deepSleepMgr.h
touch rdk/iarmmgrs-hal/mfrMgr.h
touch rdk/iarmmgrs-hal/pwrMgr.h
touch rdk/iarmmgrs-hal/sysMgr.h
touch network/wifiSrvMgrIarmIf.h
touch network/netsrvmgrIarm.h
Expand Down
6 changes: 3 additions & 3 deletions cmake/FindIARMBus.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# If not stated otherwise in this file or this component's license file the

Check failure on line 1 in cmake/FindIARMBus.cmake

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'cmake/FindIARMBus.cmake' (Match: rdkcentral/rdkservices/1, 44 lines, url: https://github.com/rdkcentral/rdkservices/archive/GRT_v1.tar.gz, file: cmake/FindIARMBus.cmake)
# following copyright and licenses apply:
#
# Copyright 2020 RDK Management
Expand Down Expand Up @@ -28,11 +28,11 @@
find_library(IARMBUS_LIBRARIES NAMES IARMBus)
find_path(IARMBUS_INCLUDE_DIRS NAMES libIARM.h PATH_SUFFIXES rdk/iarmbus)
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)
find_path(IARMMAINTEN_INCLUDE_DIRS NAMES maintenanceMGR.h PATH_SUFFIXES rdk/iarmmgrs-hal)

set(IARMBUS_LIBRARIES ${IARMBUS_LIBRARIES} CACHE PATH "Path to IARMBus library")
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")
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMMAINTEN_INCLUDE_DIRS})
set(IARMBUS_INCLUDE_DIRS ${IARMBUS_INCLUDE_DIRS} ${IARMRECEIVER_INCLUDE_DIRS} ${IARMMAINTEN_INCLUDE_DIRS} CACHE PATH "Path to IARMBus include")

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IARMBUS DEFAULT_MSG IARMBUS_INCLUDE_DIRS IARMBUS_LIBRARIES)
Expand Down
Loading