From 0f6a953690338bee5b8f90574ef93bda3473d546 Mon Sep 17 00:00:00 2001 From: agampa263 <133222558+agampa263@users.noreply.github.com> Date: Thu, 15 Jan 2026 15:04:21 +0530 Subject: [PATCH 1/3] Update build_dependencies.sh --- build_dependencies.sh | 162 +++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 87 deletions(-) diff --git a/build_dependencies.sh b/build_dependencies.sh index 86d6c353..20f5e39a 100755 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -1,130 +1,118 @@ #!/bin/bash -set -x set -e +set -x + ############################## +# Paths GITHUB_WORKSPACE="${PWD}" +INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" -cd ${GITHUB_WORKSPACE} +mkdir -p "$INSTALL_PREFIX" -# # ############################# -#1. Install Dependencies and packages +############################## +# System dependencies (sudo REQUIRED in GitHub Actions) +sudo apt update +sudo apt install -y \ + ninja-build meson cmake curl libcurl4-openssl-dev \ + libsoup2.4-dev libxml2-dev libglib2.0-dev \ + gobject-introspection libgirepository1.0-dev \ + libgtk-3-dev libcunit1-dev valac pandoc -apt update -apt install -y ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev valac pandoc pip install jsonref -############################ -# Build trevor-base64 -if [ ! -d "trower-base64" ]; then +############################## +# Build trower-base64 git clone https://github.com/xmidt-org/trower-base64.git -fi cd trower-base64 -meson setup --warnlevel 3 --werror build +meson setup build --prefix="$INSTALL_PREFIX" ninja -C build ninja -C build install cd .. -########################################### -# Clone the required repositories - -rm -rf iarmbus ThunderTools Thunder entservices-apis entservices-testframework gssdp - +############################## +# Clone required repositories git clone https://github.com/rdkcentral/iarmbus.git -export IARMBUS_PATH=$GITHUB_WORKSPACE/iarmbus - -git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git +export IARMBUS_PATH="$GITHUB_WORKSPACE/iarmbus" +git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git - git clone --branch main https://github.com/rdkcentral/entservices-apis.git - git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git - git clone --branch gssdp-1.2.3 https://gitlab.gnome.org/GNOME/gssdp.git -############################ -# Build gssdp-1.2 -echo "======================================================================================" -echo "buliding gssdp-1.2" +############################## +# Build gssdp cd gssdp - -rm -rf build -meson setup build - +meson setup build --prefix="$INSTALL_PREFIX" ninja -C build ninja -C build install -cd - +cd .. -############################ -# Build Thunder-Tools -echo "======================================================================================" -echo "buliding thunderTools" +############################## +# Build ThunderTools cd ThunderTools -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch -cd - - +patch -p1 < "$GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch" +cd .. cmake -G Ninja -S ThunderTools -B build/ThunderTools \ - -DEXCEPTIONS_ENABLE=ON \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \ - -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \ + -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \ + -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" cmake --build build/ThunderTools --target install - -############################ +############################## # Build Thunder -echo "======================================================================================" -echo "buliding thunder" - cd Thunder -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch -patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch -cd - +patch -p1 < "$GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch" +patch -p1 < "$GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch" +patch -p1 < "$GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch" +patch -p1 < "$GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch" +cd .. cmake -G Ninja -S Thunder -B build/Thunder \ - -DMESSAGING=ON \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \ - -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \ - -DBUILD_TYPE=Debug \ - -DBINDING=127.0.0.1 \ - -DPORT=55555 \ - -DEXCEPTIONS_ENABLE=ON \ + -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \ + -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \ + -DMESSAGING=ON \ + -DBUILD_TYPE=Debug \ + -DEXCEPTIONS_ENABLE=ON cmake --build build/Thunder --target install -############################ +############################## # Build entservices-apis -echo "======================================================================================" -echo "buliding entservices-apis" -cd entservices-apis -rm -rf jsonrpc/DTV.json -cd .. - -cmake -G Ninja -S entservices-apis -B build/entservices-apis \ - -DEXCEPTIONS_ENABLE=ON \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \ +cmake -G Ninja -S entservices-apis -B build/entservices-apis \ + -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \ + -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" cmake --build build/entservices-apis --target install -############################ - -############################ -# Build and deploy stubs for IARMBus and WPEFramework securityagent -mkdir -p /usr/include/WPEFramework/securityagent -cp $GITHUB_WORKSPACE/stubs/securityagent/* /usr/include/WPEFramework/securityagent/ -v - -echo "======================================================================================" -echo "Building IARMBus and WPEFramework securityagent stubs" -cd $GITHUB_WORKSPACE -cd ./stubs -g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I$GITHUB_WORKSPACE/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 libWPEFrameworkSecurityUtil.so securityagent/SecurityTokenUtil.cpp -I$GITHUB_WORKSPACE/stubs -fpermissive - -cp libIARMBus.so /usr/local/lib/ -cp libWPEFrameworkSecurityUtil.so /usr/local/lib/ +############################## +# Build and install IARMBus & SecurityAgent stubs +STUB_INCLUDE="$INSTALL_PREFIX/include" +STUB_LIB="$INSTALL_PREFIX/lib" + +mkdir -p "$STUB_INCLUDE/WPEFramework/securityagent" +mkdir -p "$STUB_LIB" + +cd "$GITHUB_WORKSPACE/stubs" + +g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp \ + -I"$GITHUB_WORKSPACE/stubs" \ + -I"$IARMBUS_PATH/core" \ + -I"$IARMBUS_PATH/core/include" \ + -I"$STUB_INCLUDE" \ + -fpermissive + +g++ -fPIC -shared -o libWPEFrameworkSecurityUtil.so \ + securityagent/SecurityTokenUtil.cpp \ + -I"$GITHUB_WORKSPACE/stubs" \ + -I"$STUB_INCLUDE" \ + -fpermissive + +cp libIARMBus.so "$STUB_LIB/" +cp libWPEFrameworkSecurityUtil.so "$STUB_LIB/" +cp securityagent/* "$STUB_INCLUDE/WPEFramework/securityagent/" + +echo "========================================================" +echo "Dependencies built and installed into $INSTALL_PREFIX" +echo "========================================================" From fdf65e215a17c67c4a3de4ceeb13e66c4ca1051a Mon Sep 17 00:00:00 2001 From: agampa263 <133222558+agampa263@users.noreply.github.com> Date: Thu, 15 Jan 2026 15:04:48 +0530 Subject: [PATCH 2/3] Update cov_build.sh --- cov_build.sh | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/cov_build.sh b/cov_build.sh index da227aba..cd6d5b20 100755 --- a/cov_build.sh +++ b/cov_build.sh @@ -1,16 +1,33 @@ #!/bin/bash -set -x set -e +set -x + ############################## +# Paths GITHUB_WORKSPACE="${PWD}" -ls -la ${GITHUB_WORKSPACE} -############################ -# Build xdialserver -echo "buliding xdialserver" +INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" -cd ${GITHUB_WORKSPACE} +############################## +# Environment +export CMAKE_PREFIX_PATH="$INSTALL_PREFIX" +export PKG_CONFIG_PATH="$INSTALL_PREFIX/lib/pkgconfig:$INSTALL_PREFIX/lib/x86_64-linux-gnu/pkgconfig" +export LD_LIBRARY_PATH="$INSTALL_PREFIX/lib:$INSTALL_PREFIX/lib/x86_64-linux-gnu" -make +############################## +# Build xdialserver (out-of-source) +cmake -G Ninja \ + -S "$GITHUB_WORKSPACE/server" \ + -B build/xdialserver \ + -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \ + -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \ + -DCMAKE_CXX_FLAGS="\ +-I$INSTALL_PREFIX/include/WPEFramework \ +-I$INSTALL_PREFIX/include/WPEFramework/core \ +-I$INSTALL_PREFIX/include/WPEFramework/plugins \ +-I$INSTALL_PREFIX/include/WPEFramework/interfaces" \ + -DCMAKE_SHARED_LINKER_FLAGS="-L$INSTALL_PREFIX/lib" \ + -DCMAKE_EXE_LINKER_FLAGS="-L$INSTALL_PREFIX/lib" \ + -DCMAKE_BUILD_RPATH="$INSTALL_PREFIX/lib" \ + -DCMAKE_INSTALL_RPATH="$INSTALL_PREFIX/lib" -echo "======================================================================================" -exit 0 +cmake --build build/xdialserver From bbf5de97943580e67dea3a9e900c89f928ecce4b Mon Sep 17 00:00:00 2001 From: agampa263 <133222558+agampa263@users.noreply.github.com> Date: Thu, 15 Jan 2026 15:10:47 +0530 Subject: [PATCH 3/3] Update native_full_build.yml --- .github/workflows/native_full_build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml index b241c8d2..1f6839b2 100755 --- a/.github/workflows/native_full_build.yml +++ b/.github/workflows/native_full_build.yml @@ -9,9 +9,7 @@ on: jobs: build-entservices-on-pr: name: Build xdialserver component in github rdkcentral - runs-on: ubuntu-latest - container: - image: ghcr.io/rdkcentral/docker-rdk-ci:latest + runs-on: ubuntu-22.04 steps: - name: Checkout code