From a26568bf4a05e742a3ebf3dc3091c200c6ce8d73 Mon Sep 17 00:00:00 2001 From: hgfell683 <107510770+hgfell683@users.noreply.github.com> Date: Fri, 29 May 2026 18:30:52 +0000 Subject: [PATCH 1/3] RDKEMW-18973 : Renable native build (#252) * RDKEMW-18973 : Renable native build --- .github/workflows/native_full_build.yml | 1 - build_dependencies.sh | 11 +++++++++++ cov_build.sh | 7 +++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml index 77e2223a..8764bae0 100644 --- a/.github/workflows/native_full_build.yml +++ b/.github/workflows/native_full_build.yml @@ -9,7 +9,6 @@ on: jobs: build-devicesettings-on-pr: name: Build devicesettings component in github rdkcentral - if: false runs-on: ubuntu-latest container: image: ghcr.io/rdkcentral/docker-rdk-ci:latest diff --git a/build_dependencies.sh b/build_dependencies.sh index 566fca25..9ffcd365 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -72,6 +72,17 @@ rm -rf rdk-halif-device_settings git clone --branch 6.0.0 --depth 1 https://github.com/rdkcentral/rdk-halif-device_settings.git export DS_IF_PATH=$ROOT/rdk-halif-device_settings +cd $ROOT +rm -rf entservices-testframework +git clone --branch 1.0.1 https://github.com/rdkcentral/entservices-testframework.git + +# Provide telemetry compatibility header used by devicesettings coverage build. +mkdir -p $ROOT/entservices-testframework/Tests/headers +cat << 'EOF' > $ROOT/entservices-testframework/Tests/headers/telemetry_busmessage_sender.h +#pragma once +#include "../mocks/Telemetry.h" +EOF + cd $WORKDIR patch -p1 < "$WORKDIR/patches/dsDisplay.patch" diff --git a/cov_build.sh b/cov_build.sh index 22e8d7d4..4202f4b1 100644 --- a/cov_build.sh +++ b/cov_build.sh @@ -19,8 +19,10 @@ export RFC_PATH=$ROOT/rfc export IARMBUS_PATH=$ROOT/iarmbus export IARM_PATH=$IARMBUS_PATH export IARMMGRS_PATH=$ROOT/iarmmgrs +export IARM_MGRS=$IARMMGRS_PATH export RDKLOGGER_PATH=$ROOT/rdk_logger export TELEMETRY_PATH=$ROOT/telemetry +export TEST_FRAMEWORK_PATH=$ROOT/entservices-testframework export DS_PATH=$ROOT/devicesettings export DS_IF_PATH=$ROOT/rdk-halif-device_settings export POWER_IF_PATH=$ROOT/rdk-halif-power_manager @@ -33,13 +35,14 @@ cd $WORKDIR cd ./stubs g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I$WORKDIR/stubs -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$IARMBUS_PATH/core -I$IARMBUS_PATH/core/include -fpermissive g++ -fPIC -shared -o libWPEFrameworkPowerController.so powerctrl_stubs.cpp -I$WORKDIR/stubs -I${POWER_IF_PATH}/include -fpermissive +g++ -fPIC -shared -o libtelemetry_msgsender.so ${TEST_FRAMEWORK_PATH}/Tests/mocks/MockProxy/TelemetryProxy.cpp -I${TEST_FRAMEWORK_PATH}/Tests/mocks -fpermissive gcc -fPIC -shared -o libdshal.so dshal_stubs.c -I${DS_IF_PATH}/include -I$WORKDIR/mfr/include #g++ -fPIC -shared -o libdshalsrv.so dshalsrv_stubs.c -I${DS_IF_PATH}/include -I${DS_PATH}/rpc/include #g++ -fPIC -shared -o libds.so ds_stubs.cpp -I${DS_IF_PATH}/include/ -I${DS_PATH}/ds/include -I${DS_PATH}/rpc/include cp libIARMBus.so /usr/local/lib/ -#cp libtelemetry_msgsender.so /usr/local/lib/ +cp libtelemetry_msgsender.so /usr/local/lib/ cp libWPEFrameworkPowerController.so /usr/local/lib/libWPEFrameworkPowerController.so #cp libds.so /usr/local/lib/ @@ -70,4 +73,4 @@ find $WORKDIR -iname "*.o" -exec rm -v {} \; find $WORKDIR -iname "*.so*" -exec rm -v {} \; echo "##### Triggering make" -make CFLAGS+='-fPIC -DDSMGR_LOGGER_ENABLED=ON -DRDK_DSHAL_NAME=\"libdshal.so\" -I${DS_IF_PATH}/include -I${DS_HAL_PATH} -I${DS_MGRS}/stubs -I${IARMBUS_PATH}/core -I${IARMBUS_PATH}/core/include -I${IARM_MGRS}/sysmgr/include -I${DS_MGRS}/ds/include -I${DS_MGRS}/rpc/include -I${POWER_IF_PATH}/include/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I${IARM_MGRS}/mfr/include/ -I${IARM_MGRS}/mfr/common -I${DEEPSLEEP_IF_PATH}/include -I${IARM_MGRS}/hal/include -I${IARM_MGRS}/power -I${IARM_MGRS}/power/include' LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -L/usr/local/include -lglib-2.0 -lIARMBus -lWPEFrameworkPowerController -ldshal" \ No newline at end of file +make CFLAGS+='-fPIC -DDSMGR_LOGGER_ENABLED=ON -DRDK_DSHAL_NAME=\"libdshal.so\" -I${DS_IF_PATH}/include -I${DS_HAL_PATH} -I${DS_MGRS}/stubs -I${TEST_FRAMEWORK_PATH}/Tests/headers -I${TEST_FRAMEWORK_PATH}/Tests/mocks -I${IARMBUS_PATH}/core -I${IARMBUS_PATH}/core/include -I${IARM_MGRS}/sysmgr/include -I${DS_MGRS}/ds/include -I${DS_MGRS}/rpc/include -I${POWER_IF_PATH}/include/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I${IARM_MGRS}/mfr/include/ -I${IARM_MGRS}/mfr/common -I${DEEPSLEEP_IF_PATH}/include -I${IARM_MGRS}/hal/include -I${IARM_MGRS}/power -I${IARM_MGRS}/power/include -include ${TEST_FRAMEWORK_PATH}/Tests/mocks/Telemetry.h' LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -L/usr/local/lib -lglib-2.0 -lIARMBus -lWPEFrameworkPowerController -ldshal" \ No newline at end of file From 0b04f37da93b976aa0a4e6551a352a4304892dcf Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Tue, 2 Jun 2026 21:14:28 +0530 Subject: [PATCH 2/3] RDKEMW-16730 : Evaluation on finding invalid markers in entservices repos (#245) * Updated the Invalid Markers --------- Co-authored-by: smohap466_comcast Co-authored-by: preeja33 --- rpc/srv/dsAudio.c | 6 ++---- rpc/srv/dsDisplay.c | 2 +- rpc/srv/dsVideoPort.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rpc/srv/dsAudio.c b/rpc/srv/dsAudio.c index d35315b3..6ee65f82 100755 --- a/rpc/srv/dsAudio.c +++ b/rpc/srv/dsAudio.c @@ -2086,7 +2086,7 @@ void AudioConfigInit() { char telemetryValue[128] = {0}; snprintf(telemetryValue, sizeof(telemetryValue), "dsSetStereoMode The HDMI ARC Port Audio Settings Mode is %d", _srv_HDMI_ARC_Audiomode); - TELEMETRY_EVENT_STRING("SYS_INFO_PASSTHRUENABLED", telemetryValue); + TELEMETRY_EVENT_INT("SYS_INFO_PASSTHRUENABLED", 1); } } } @@ -2749,9 +2749,7 @@ IARM_Result_t _dsSetStereoMode(void *arg) { INT_INFO("Setting Audio Mode PASSTHRU with persistent value %d \r\n",param->toPersist); if(param->toPersist){ - char telemetryValue[128] = {0}; - snprintf(telemetryValue, sizeof(telemetryValue), "The HDMI Audio Mode Setting From Persistent is %d", param->toPersist); - TELEMETRY_EVENT_STRING("SYS_INFO_Userpassthruenable", telemetryValue); + TELEMETRY_EVENT_INT("SYS_INFO_Userpassthruenable", 1); } diff --git a/rpc/srv/dsDisplay.c b/rpc/srv/dsDisplay.c index 4fdc8cee..7580251d 100644 --- a/rpc/srv/dsDisplay.c +++ b/rpc/srv/dsDisplay.c @@ -543,7 +543,7 @@ void _dsDisplayEventCallback(intptr_t handle, dsDisplayEvent_t event, void *even case dsDISPLAY_RXSENSE_OFF: INT_INFO("Rx Sense Status OFF !!!!!!!! ..\r\n"); - TELEMETRY_EVENT_STRING("HDMI_INFO_tv_off", "Rx Sense Status OFF"); + TELEMETRY_EVENT_INT("HDMI_INFO_tv_off", 1); _eventData.data.hdmi_rxsense.status = dsDISPLAY_RXSENSE_OFF ; _eventId = IARM_BUS_DSMGR_EVENT_RX_SENSE; break; diff --git a/rpc/srv/dsVideoPort.c b/rpc/srv/dsVideoPort.c index 646032c5..e9822ee8 100644 --- a/rpc/srv/dsVideoPort.c +++ b/rpc/srv/dsVideoPort.c @@ -193,7 +193,7 @@ IARM_Result_t dsVideoPortMgr_init() { char telemetryValue[128] = {0}; snprintf(telemetryValue, sizeof(telemetryValue), "The Persistent HDMI resolution read is %s", _dsHDMIResolution.c_str()); - TELEMETRY_EVENT_STRING("SYS_INFO_4KResolution", telemetryValue); + TELEMETRY_EVENT_STRING("SYS_INFO_4KResolution_split", telemetryValue); } #ifdef HAS_ONLY_COMPOSITE From a011ef41c78b4c46d11e60c349c8070d395be031 Mon Sep 17 00:00:00 2001 From: apatel859 Date: Tue, 2 Jun 2026 19:11:24 +0000 Subject: [PATCH 3/3] 1.0.35 release change log updates --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c52ddc0e..9e213c00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,18 @@ 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). +#### [1.0.35](https://github.com/rdkcentral/devicesettings/compare/1.0.34...1.0.35) + +- RDKEMW-16730 : Evaluation on finding invalid markers in entservices repos [`#245`](https://github.com/rdkcentral/devicesettings/pull/245) +- RDKEMW-18973 : Renable native build [`#252`](https://github.com/rdkcentral/devicesettings/pull/252) +- Merge tag '1.0.34' into develop [`6d1ab81`](https://github.com/rdkcentral/devicesettings/commit/6d1ab8109583ce0780117ac0abe13fc1e949fabf) + #### [1.0.34](https://github.com/rdkcentral/devicesettings/compare/1.0.33...1.0.34) +> 21 May 2026 + - RDKEMW-18914: Unable to Play Any Content on Netflix [`#249`](https://github.com/rdkcentral/devicesettings/pull/249) +- 1.0.34 release change log updates [`9e7b352`](https://github.com/rdkcentral/devicesettings/commit/9e7b3528b3986548a70feec2538bc17dfc6937b7) - Merge tag '1.0.33' into develop [`33b7f57`](https://github.com/rdkcentral/devicesettings/commit/33b7f571a6b43244706d9ad379a6e01af13c0ab4) #### [1.0.33](https://github.com/rdkcentral/devicesettings/compare/1.0.32...1.0.33)