From fa72660a3cfa6729491a02a2303115042d95d275 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Fri, 9 Jan 2026 16:47:58 +0530
Subject: [PATCH 01/28] Update gdial-plat-util.c

---
 server/plat/gdial-plat-util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/plat/gdial-plat-util.c b/server/plat/gdial-plat-util.c
index fd6e9594..d21e8441 100644
--- a/server/plat/gdial-plat-util.c
+++ b/server/plat/gdial-plat-util.c
@@ -14,7 +14,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations un der the License.
  */
 
 #include <stdio.h>

From 05aa004d87d185073e940751981e95df92c5aa0a Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 11:00:42 +0530
Subject: [PATCH 02/28] 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

From 252d5b36c4ca0f1a5fb3cdd7a5cf80991d89c096 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 11:24:44 +0530
Subject: [PATCH 03/28] Update native_full_build.yml

---
 .github/workflows/native_full_build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml
index 1f6839b2..33c5bcb6 100755
--- a/.github/workflows/native_full_build.yml
+++ b/.github/workflows/native_full_build.yml
@@ -10,6 +10,7 @@ jobs:
   build-entservices-on-pr:
     name: Build xdialserver component in github rdkcentral
     runs-on: ubuntu-22.04
+    options: --user root
 
     steps:
       - name: Checkout code

From 9ba446f4f7b7c040ed4f99b9fa36d28149bd3d6c Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 11:27:53 +0530
Subject: [PATCH 04/28] Update build_dependencies.sh

---
 build_dependencies.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 86d6c353..be298d32 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -9,8 +9,8 @@ cd ${GITHUB_WORKSPACE}
 # # ############################# 
 #1. Install Dependencies and packages
 
-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
+sudo apt update
+sudo 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
 
 ############################

From 16870c5959ce66dd08ccca7eb999e8996c91ab97 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 11:28:09 +0530
Subject: [PATCH 05/28] Update native_full_build.yml

---
 .github/workflows/native_full_build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml
index 33c5bcb6..1f6839b2 100755
--- a/.github/workflows/native_full_build.yml
+++ b/.github/workflows/native_full_build.yml
@@ -10,7 +10,6 @@ jobs:
   build-entservices-on-pr:
     name: Build xdialserver component in github rdkcentral
     runs-on: ubuntu-22.04
-    options: --user root
 
     steps:
       - name: Checkout code

From 581e87edf2a052e8632937a2a3d53c1d6971c576 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 11:41:58 +0530
Subject: [PATCH 06/28] Update build_dependencies.sh

---
 build_dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index be298d32..7fe306ba 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -10,7 +10,7 @@ cd ${GITHUB_WORKSPACE}
 #1. Install Dependencies and packages
 
 sudo apt update
-sudo 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
+sudo apt install -y ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libcunit1-dev valac pandoc
 pip install jsonref
 
 ############################

From 01f95860a7236a68e8a4b69030237b697ea4ebf7 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 11:48:01 +0530
Subject: [PATCH 07/28] Update build_dependencies.sh

---
 build_dependencies.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 7fe306ba..c76057a1 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -21,7 +21,7 @@ fi
 cd trower-base64
 meson setup --warnlevel 3 --werror build
 ninja -C build
-ninja -C build install
+sudo ninja -C build install
 cd ..
 ###########################################
 # Clone the required repositories
@@ -52,7 +52,7 @@ rm -rf build
 meson setup build
 
 ninja -C build
-ninja -C build install
+sudo ninja -C build install
 cd -
 
 ############################

From ed02046411e0b3a73e59349322d9c601b3c4b21a Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:04:26 +0530
Subject: [PATCH 08/28] Update build_dependencies.sh

---
 build_dependencies.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index c76057a1..15e84033 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -70,9 +70,11 @@ cmake -G Ninja -S ThunderTools -B build/ThunderTools \
     -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
     -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
 
+DESTDIR="$GITHUB_WORKSPACE/install" \
 cmake --build build/ThunderTools --target install
 
 
+
 ############################
 # Build Thunder
 echo "======================================================================================"

From 6460dda38a60ab2bfe88fb7166fb252c7d741440 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:34:18 +0530
Subject: [PATCH 09/28] Update build_dependencies.sh

---
 build_dependencies.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 15e84033..52426a06 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -10,7 +10,7 @@ cd ${GITHUB_WORKSPACE}
 #1. Install Dependencies and packages
 
 sudo apt update
-sudo apt install -y ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libcunit1-dev valac pandoc
+sudo 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
 
 ############################
@@ -70,11 +70,9 @@ cmake -G Ninja -S ThunderTools -B build/ThunderTools \
     -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
     -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
 
-DESTDIR="$GITHUB_WORKSPACE/install" \
 cmake --build build/ThunderTools --target install
 
 
-
 ############################
 # Build Thunder
 echo "======================================================================================"

From 4408d1f0388263382bba4e9a043668bee76e5ce3 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:42:23 +0530
Subject: [PATCH 10/28] Update build_dependencies.sh

---
 build_dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 52426a06..c76057a1 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -10,7 +10,7 @@ cd ${GITHUB_WORKSPACE}
 #1. Install Dependencies and packages
 
 sudo apt update
-sudo 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
+sudo apt install -y ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libcunit1-dev valac pandoc
 pip install jsonref
 
 ############################

From 03e596e7b1a2055dbc0a7e8b294a22e946f4e688 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:27:47 +0530
Subject: [PATCH 11/28] Update build_dependencies.sh

---
 build_dependencies.sh | 156 +++++++++++++++++++++++-------------------
 1 file changed, 86 insertions(+), 70 deletions(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index c76057a1..6da59ad8 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -1,130 +1,146 @@
 #!/bin/bash
-set -x
 set -e
+set -x
+
 ##############################
+# Workspace setup
 GITHUB_WORKSPACE="${PWD}"
+INSTALL_DIR="$GITHUB_WORKSPACE/install"
 
-cd ${GITHUB_WORKSPACE}
+mkdir -p "$INSTALL_DIR"
 
-# # ############################# 
-#1. Install Dependencies and packages
+export PATH="$INSTALL_DIR/bin:$INSTALL_DIR/sbin:$PATH"
+export LD_LIBRARY_PATH="$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH"
+export PKG_CONFIG_PATH="$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/lib64/pkgconfig:$PKG_CONFIG_PATH"
 
+cd "$GITHUB_WORKSPACE"
+
+##############################
+# 1. Install system dependencies (still needs sudo)
 sudo apt update
-sudo apt install -y ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libcunit1-dev valac pandoc
+sudo apt install -y \
+    ninja-build meson curl \
+    libsoup2.4-dev libxml2-dev libglib2.0-dev \
+    gobject-introspection libgirepository1.0-dev \
+    libgtk-3-dev libcunit1-dev \
+    valac pandoc
+
 pip install jsonref
 
-############################
-# Build trevor-base64
+##############################
+# Build trower-base64
 if [ ! -d "trower-base64" ]; then
-git clone https://github.com/xmidt-org/trower-base64.git
+    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_DIR"
 ninja -C build
-sudo ninja -C build install
+ninja -C build install
 cd ..
-###########################################
-# Clone the required repositories
 
+##############################
+# Clone repositories
 rm -rf iarmbus ThunderTools Thunder entservices-apis entservices-testframework gssdp
 
-
 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
+##############################
+# Build gssdp
 echo "======================================================================================"
-echo "buliding gssdp-1.2"
-cd gssdp
-
-rm -rf build
-meson setup build
+echo "building gssdp"
 
+cd gssdp
+meson setup build --prefix="$INSTALL_DIR"
 ninja -C build
-sudo ninja -C build install
-cd -
+ninja -C build install
+cd ..
 
-############################
-# Build Thunder-Tools
+##############################
+# Build ThunderTools
 echo "======================================================================================"
-echo "buliding thunderTools"
-cd ThunderTools
-patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
-cd -
+echo "building ThunderTools"
 
+cd ThunderTools
+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_DIR" \
+    -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
+    -DGENERIC_CMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake"
 
 cmake --build build/ThunderTools --target install
 
-
-############################
+##############################
 # Build Thunder
 echo "======================================================================================"
-echo "buliding thunder"
+echo "building 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" \
+    -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
+    -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
+    -DGENERIC_CMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
     -DBUILD_TYPE=Debug \
     -DBINDING=127.0.0.1 \
     -DPORT=55555 \
-    -DEXCEPTIONS_ENABLE=ON \
+    -DEXCEPTIONS_ENABLE=ON
 
 cmake --build build/Thunder --target install
 
-############################
+##############################
 # Build entservices-apis
 echo "======================================================================================"
-echo "buliding entservices-apis"
+echo "building 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_DIR" \
+    -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
+    -DEXCEPTIONS_ENABLE=ON
 
 cmake --build build/entservices-apis --target install
 
-############################
+##############################
+# Build IARMBus & SecurityAgent stubs (local)
+echo "======================================================================================"
+echo "Building stubs"
+
+mkdir -p "$INSTALL_DIR/include/WPEFramework/securityagent"
+cp stubs/securityagent/* "$INSTALL_DIR/include/WPEFramework/securityagent/"
 
-############################
-# 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
+cd stubs
 
-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/
+g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp \
+    -I"$GITHUB_WORKSPACE/stubs" \
+    -I"$INSTALL_DIR/include" \
+    -I"$IARMBUS_PATH/core" \
+    -I"$IARMBUS_PATH/core/include" \
+    -fpermissive
+
+g++ -fPIC -shared -o libWPEFrameworkSecurityUtil.so \
+    securityagent/SecurityTokenUtil.cpp \
+    -I"$GITHUB_WORKSPACE/stubs" \
+    -I"$INSTALL_DIR/include" \
+    -fpermissive
+
+cp libIARMBus.so "$INSTALL_DIR/lib/"
+cp libWPEFrameworkSecurityUtil.so "$INSTALL_DIR/lib/"

From d04556eb3971dca1a1c44faa784cf9b797d46140 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:44:54 +0530
Subject: [PATCH 12/28] Update cov_build.sh

---
 cov_build.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/cov_build.sh b/cov_build.sh
index da227aba..d44b465e 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -1,16 +1,23 @@
 #!/bin/bash
-set -x
 set -e
+set -x
+
 ##############################
 GITHUB_WORKSPACE="${PWD}"
-ls -la ${GITHUB_WORKSPACE}
+INSTALL_DIR="$GITHUB_WORKSPACE/install"
+
+export PKG_CONFIG_PATH="$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/lib64/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH"
+export PATH="$INSTALL_DIR/bin:$INSTALL_DIR/sbin:$PATH"
+
+ls -la "${GITHUB_WORKSPACE}"
+
 ############################
 # Build xdialserver
-echo "buliding xdialserver"
+echo "building xdialserver"
 
-cd ${GITHUB_WORKSPACE}
+cd "${GITHUB_WORKSPACE}"
 
 make
 
 echo "======================================================================================"
-exit 0

From e7d9e395b50821aca6ca9f682e799225791c4657 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:07:28 +0530
Subject: [PATCH 13/28] Update cov_build.sh

---
 cov_build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cov_build.sh b/cov_build.sh
index d44b465e..e062f945 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -6,8 +6,8 @@ set -x
 GITHUB_WORKSPACE="${PWD}"
 INSTALL_DIR="$GITHUB_WORKSPACE/install"
 
-export PKG_CONFIG_PATH="$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/lib64/pkgconfig:$PKG_CONFIG_PATH"
-export LD_LIBRARY_PATH="$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH"
+export PKG_CONFIG_PATH="$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/lib64/pkgconfig:$INSTALL_DIR/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$INSTALL_DIR/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
 export PATH="$INSTALL_DIR/bin:$INSTALL_DIR/sbin:$PATH"
 
 ls -la "${GITHUB_WORKSPACE}"

From eaed86fd67fecb7bf5cf5262176dbf924e6e905f Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:19:25 +0530
Subject: [PATCH 14/28] Update cov_build.sh

---
 cov_build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cov_build.sh b/cov_build.sh
index e062f945..50c9f177 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -10,6 +10,8 @@ export PKG_CONFIG_PATH="$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/lib64/pkgconfig:
 export LD_LIBRARY_PATH="$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$INSTALL_DIR/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
 export PATH="$INSTALL_DIR/bin:$INSTALL_DIR/sbin:$PATH"
 
+export CMAKE_PREFIX_PATH="$INSTALL_DIR:$CMAKE_PREFIX_PATH"
+
 ls -la "${GITHUB_WORKSPACE}"
 
 ############################

From 7ce476c6f817472ac3f933f28adf68941dcc0261 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:27:27 +0530
Subject: [PATCH 15/28] Update cov_build.sh

---
 cov_build.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/cov_build.sh b/cov_build.sh
index 50c9f177..2e75cb0b 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -2,24 +2,23 @@
 set -e
 set -x
 
-##############################
 GITHUB_WORKSPACE="${PWD}"
 INSTALL_DIR="$GITHUB_WORKSPACE/install"
 
 export PKG_CONFIG_PATH="$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/lib64/pkgconfig:$INSTALL_DIR/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$INSTALL_DIR/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
 export PATH="$INSTALL_DIR/bin:$INSTALL_DIR/sbin:$PATH"
-
-export CMAKE_PREFIX_PATH="$INSTALL_DIR:$CMAKE_PREFIX_PATH"
+export CMAKE_PREFIX_PATH="$INSTALL_DIR"
 
 ls -la "${GITHUB_WORKSPACE}"
 
-############################
-# Build xdialserver
 echo "building xdialserver"
 
-cd "${GITHUB_WORKSPACE}"
+cd "${GITHUB_WORKSPACE}/server"
+
+rm -rf CMakeCache.txt CMakeFiles
 
+cmake . -DCMAKE_PREFIX_PATH="$INSTALL_DIR"
 make
 
 echo "======================================================================================"

From 4802e566b95d86fb38e6e259f56cebaeba1c2221 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:32:51 +0530
Subject: [PATCH 16/28] Update build_dependencies.sh

---
 build_dependencies.sh | 72 ++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 49 deletions(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 6da59ad8..5ff82e3f 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -3,23 +3,14 @@ set -e
 set -x
 
 ##############################
-# Workspace setup
 GITHUB_WORKSPACE="${PWD}"
-INSTALL_DIR="$GITHUB_WORKSPACE/install"
-
-mkdir -p "$INSTALL_DIR"
-
-export PATH="$INSTALL_DIR/bin:$INSTALL_DIR/sbin:$PATH"
-export LD_LIBRARY_PATH="$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$LD_LIBRARY_PATH"
-export PKG_CONFIG_PATH="$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/lib64/pkgconfig:$PKG_CONFIG_PATH"
-
-cd "$GITHUB_WORKSPACE"
+cd "${GITHUB_WORKSPACE}"
 
 ##############################
-# 1. Install system dependencies (still needs sudo)
+# Install system dependencies
 sudo apt update
 sudo apt install -y \
-    ninja-build meson curl \
+    ninja-build meson cmake curl \
     libsoup2.4-dev libxml2-dev libglib2.0-dev \
     gobject-introspection libgirepository1.0-dev \
     libgtk-3-dev libcunit1-dev \
@@ -34,9 +25,9 @@ if [ ! -d "trower-base64" ]; then
 fi
 
 cd trower-base64
-meson setup build --prefix="$INSTALL_DIR"
+meson setup build
 ninja -C build
-ninja -C build install
+sudo ninja -C build install
 cd ..
 
 ##############################
@@ -54,36 +45,25 @@ git clone --branch gssdp-1.2.3 https://gitlab.gnome.org/GNOME/gssdp.git
 
 ##############################
 # Build gssdp
-echo "======================================================================================"
-echo "building gssdp"
-
 cd gssdp
-meson setup build --prefix="$INSTALL_DIR"
+meson setup build
 ninja -C build
-ninja -C build install
+sudo ninja -C build install
 cd ..
 
 ##############################
 # Build ThunderTools
-echo "======================================================================================"
-echo "building ThunderTools"
-
 cd ThunderTools
 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 \
-    -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
-    -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
-    -DGENERIC_CMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake"
+    -DCMAKE_INSTALL_PREFIX=/usr
 
-cmake --build build/ThunderTools --target install
+sudo cmake --build build/ThunderTools --target install
 
 ##############################
 # Build Thunder
-echo "======================================================================================"
-echo "building 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"
@@ -92,46 +72,38 @@ patch -p1 < "$GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-
 cd ..
 
 cmake -G Ninja -S Thunder -B build/Thunder \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DMESSAGING=ON \
-    -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
-    -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
-    -DGENERIC_CMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
     -DBUILD_TYPE=Debug \
     -DBINDING=127.0.0.1 \
     -DPORT=55555 \
     -DEXCEPTIONS_ENABLE=ON
 
-cmake --build build/Thunder --target install
+sudo cmake --build build/Thunder --target install
 
 ##############################
 # Build entservices-apis
-echo "======================================================================================"
-echo "building entservices-apis"
-
 cd entservices-apis
 rm -rf jsonrpc/DTV.json
 cd ..
 
 cmake -G Ninja -S entservices-apis -B build/entservices-apis \
-    -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
-    -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DEXCEPTIONS_ENABLE=ON
 
-cmake --build build/entservices-apis --target install
+sudo cmake --build build/entservices-apis --target install
 
 ##############################
-# Build IARMBus & SecurityAgent stubs (local)
-echo "======================================================================================"
-echo "Building stubs"
-
-mkdir -p "$INSTALL_DIR/include/WPEFramework/securityagent"
-cp stubs/securityagent/* "$INSTALL_DIR/include/WPEFramework/securityagent/"
+# Build and install stubs (system-wide)
+sudo mkdir -p /usr/include/WPEFramework/securityagent
+sudo cp stubs/securityagent/* /usr/include/WPEFramework/securityagent/
 
 cd stubs
 
 g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp \
     -I"$GITHUB_WORKSPACE/stubs" \
-    -I"$INSTALL_DIR/include" \
+    -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
@@ -139,8 +111,10 @@ g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp \
 g++ -fPIC -shared -o libWPEFrameworkSecurityUtil.so \
     securityagent/SecurityTokenUtil.cpp \
     -I"$GITHUB_WORKSPACE/stubs" \
-    -I"$INSTALL_DIR/include" \
     -fpermissive
 
-cp libIARMBus.so "$INSTALL_DIR/lib/"
-cp libWPEFrameworkSecurityUtil.so "$INSTALL_DIR/lib/"
+sudo cp libIARMBus.so /usr/lib/
+sudo cp libWPEFrameworkSecurityUtil.so /usr/lib/
+sudo ldconfig
+
+echo "===== Script 1 completed successfully (Option 1) ====="

From 6d4b9d5b9dd2c9e95448d8224f2f23a08f6eb215 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:33:09 +0530
Subject: [PATCH 17/28] Update cov_build.sh

---
 cov_build.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/cov_build.sh b/cov_build.sh
index 2e75cb0b..19c16dbf 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -2,13 +2,8 @@
 set -e
 set -x
 
+##############################
 GITHUB_WORKSPACE="${PWD}"
-INSTALL_DIR="$GITHUB_WORKSPACE/install"
-
-export PKG_CONFIG_PATH="$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/lib64/pkgconfig:$INSTALL_DIR/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"
-export LD_LIBRARY_PATH="$INSTALL_DIR/lib:$INSTALL_DIR/lib64:$INSTALL_DIR/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
-export PATH="$INSTALL_DIR/bin:$INSTALL_DIR/sbin:$PATH"
-export CMAKE_PREFIX_PATH="$INSTALL_DIR"
 
 ls -la "${GITHUB_WORKSPACE}"
 
@@ -16,9 +11,10 @@ echo "building xdialserver"
 
 cd "${GITHUB_WORKSPACE}/server"
 
+# 🔥 CRITICAL: clean cache from previous Option 2 builds
 rm -rf CMakeCache.txt CMakeFiles
 
-cmake . -DCMAKE_PREFIX_PATH="$INSTALL_DIR"
+cmake .
 make
 
-echo "======================================================================================"
+echo "===== xdialserver build completed successfully ====="

From c269f7e4b25026114355d45feb14a46d527a79e0 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:33:31 +0530
Subject: [PATCH 18/28] Update cov_build.sh

---
 cov_build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cov_build.sh b/cov_build.sh
index 19c16dbf..2cadc1e4 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -11,7 +11,6 @@ echo "building xdialserver"
 
 cd "${GITHUB_WORKSPACE}/server"
 
-# 🔥 CRITICAL: clean cache from previous Option 2 builds
 rm -rf CMakeCache.txt CMakeFiles
 
 cmake .

From b87c35b3d3a061c10886989aef5074a5cbd3de36 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:57:52 +0530
Subject: [PATCH 19/28] Update build_dependencies.sh

---
 build_dependencies.sh | 120 +++++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 61 deletions(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 5ff82e3f..51c10a40 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -3,52 +3,49 @@ set -e
 set -x
 
 ##############################
+# Paths
 GITHUB_WORKSPACE="${PWD}"
-cd "${GITHUB_WORKSPACE}"
+INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
+
+mkdir -p "$INSTALL_PREFIX"
 
 ##############################
-# Install system dependencies
-sudo apt update
-sudo apt install -y \
-    ninja-build meson cmake curl \
-    libsoup2.4-dev libxml2-dev libglib2.0-dev \
-    gobject-introspection libgirepository1.0-dev \
-    libgtk-3-dev libcunit1-dev \
-    valac pandoc
+# System dependencies
+apt update
+apt install -y \
+  ninja-build meson cmake curl \
+  libsoup2.4-dev libxml2-dev libglib2.0-dev \
+  gobject-introspection libgirepository1.0-dev \
+  libgtk-3-dev libcunit1-dev valac pandoc
 
 pip install jsonref
 
 ##############################
 # Build trower-base64
-if [ ! -d "trower-base64" ]; then
-    git clone https://github.com/xmidt-org/trower-base64.git
-fi
-
+git clone https://github.com/xmidt-org/trower-base64.git || true
 cd trower-base64
-meson setup build
+meson setup build --prefix="$INSTALL_PREFIX"
 ninja -C build
-sudo ninja -C build install
+ninja -C build install
 cd ..
 
 ##############################
-# Clone repositories
-rm -rf iarmbus ThunderTools Thunder entservices-apis entservices-testframework gssdp
-
-git clone https://github.com/rdkcentral/iarmbus.git
+# Clone required repositories
+git clone https://github.com/rdkcentral/iarmbus.git || true
 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
+git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git || true
+git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git || true
+git clone --branch main https://github.com/rdkcentral/entservices-apis.git || true
+git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git || true
+git clone --branch gssdp-1.2.3 https://gitlab.gnome.org/GNOME/gssdp.git || true
 
 ##############################
 # Build gssdp
 cd gssdp
-meson setup build
+meson setup build --prefix="$INSTALL_PREFIX"
 ninja -C build
-sudo ninja -C build install
+ninja -C build install
 cd ..
 
 ##############################
@@ -58,9 +55,10 @@ patch -p1 < "$GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-
 cd ..
 
 cmake -G Ninja -S ThunderTools -B build/ThunderTools \
-    -DCMAKE_INSTALL_PREFIX=/usr
+  -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
+  -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
 
-sudo cmake --build build/ThunderTools --target install
+cmake --build build/ThunderTools --target install
 
 ##############################
 # Build Thunder
@@ -72,49 +70,49 @@ patch -p1 < "$GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-
 cd ..
 
 cmake -G Ninja -S Thunder -B build/Thunder \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMESSAGING=ON \
-    -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
 
-sudo cmake --build build/Thunder --target install
+cmake --build build/Thunder --target install
 
 ##############################
 # Build entservices-apis
-cd entservices-apis
-rm -rf jsonrpc/DTV.json
-cd ..
-
 cmake -G Ninja -S entservices-apis -B build/entservices-apis \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DEXCEPTIONS_ENABLE=ON
+  -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
+  -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
 
-sudo cmake --build build/entservices-apis --target install
+cmake --build build/entservices-apis --target install
 
 ##############################
-# Build and install stubs (system-wide)
-sudo mkdir -p /usr/include/WPEFramework/securityagent
-sudo cp stubs/securityagent/* /usr/include/WPEFramework/securityagent/
+# 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 stubs
+cd "$GITHUB_WORKSPACE/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
+  -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" \
-    -fpermissive
-
-sudo cp libIARMBus.so /usr/lib/
-sudo cp libWPEFrameworkSecurityUtil.so /usr/lib/
-sudo ldconfig
-
-echo "===== Script 1 completed successfully (Option 1) ====="
+  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 "Thunder stack + stubs installed into $INSTALL_PREFIX"
+echo "========================================================"

From 33225f80066ce1245adfecbe606784481d8658dd Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:58:46 +0530
Subject: [PATCH 20/28] Update cov_build.sh

---
 cov_build.sh | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/cov_build.sh b/cov_build.sh
index 2cadc1e4..7c278606 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -2,18 +2,17 @@
 set -e
 set -x
 
-##############################
 GITHUB_WORKSPACE="${PWD}"
+INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
 
-ls -la "${GITHUB_WORKSPACE}"
+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"
 
-echo "building xdialserver"
+cmake -G Ninja \
+  -S "$GITHUB_WORKSPACE/server" \
+  -B build/xdialserver \
+  -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
+  -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
 
-cd "${GITHUB_WORKSPACE}/server"
-
-rm -rf CMakeCache.txt CMakeFiles
-
-cmake .
-make
-
-echo "===== xdialserver build completed successfully ====="
+cmake --build build/xdialserver

From 61f79cbbe3795e1f265db4645b376f6affa38efe Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 16:02:26 +0530
Subject: [PATCH 21/28] Update build_dependencies.sh

---
 build_dependencies.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 51c10a40..1611ae3c 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -10,9 +10,9 @@ INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
 mkdir -p "$INSTALL_PREFIX"
 
 ##############################
-# System dependencies
-apt update
-apt install -y \
+# System dependencies (sudo REQUIRED in GitHub Actions)
+sudo apt update
+sudo apt install -y \
   ninja-build meson cmake curl \
   libsoup2.4-dev libxml2-dev libglib2.0-dev \
   gobject-introspection libgirepository1.0-dev \
@@ -114,5 +114,5 @@ cp libWPEFrameworkSecurityUtil.so "$STUB_LIB/"
 cp securityagent/* "$STUB_INCLUDE/WPEFramework/securityagent/"
 
 echo "========================================================"
-echo "Thunder stack + stubs installed into $INSTALL_PREFIX"
+echo "Dependencies built and installed into $INSTALL_PREFIX"
 echo "========================================================"

From bbc259cae5c573114ee56e7c53922a038884c723 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 16:02:47 +0530
Subject: [PATCH 22/28] Update cov_build.sh


From 639afb0ffc286a8bae43f0455bded06a3204e7f3 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 16:26:50 +0530
Subject: [PATCH 23/28] Update cov_build.sh

---
 cov_build.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cov_build.sh b/cov_build.sh
index 7c278606..f8fec029 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -5,14 +5,19 @@ set -x
 GITHUB_WORKSPACE="${PWD}"
 INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
 
+##############################
+# 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"
 
+##############################
+# 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_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
+  -DCMAKE_CXX_FLAGS="-I$INSTALL_PREFIX/include/WPEFramework/core"
 
 cmake --build build/xdialserver

From 6abd04cb3d55a197fdca586f9f28e71986709399 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 17:11:27 +0530
Subject: [PATCH 24/28] Update cov_build.sh

---
 cov_build.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cov_build.sh b/cov_build.sh
index f8fec029..a07b81b2 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -5,19 +5,17 @@ set -x
 GITHUB_WORKSPACE="${PWD}"
 INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
 
-##############################
-# 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"
 
-##############################
-# 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/core"
+  -DCMAKE_CXX_FLAGS="\
+-I$INSTALL_PREFIX/include/WPEFramework/core \
+-I$INSTALL_PREFIX/include/WPEFramework/plugins"
 
 cmake --build build/xdialserver

From ab18d4e7fef01e5b7d479e68c18b25691bde8fc6 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 17:21:09 +0530
Subject: [PATCH 25/28] Update cov_build.sh

---
 cov_build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cov_build.sh b/cov_build.sh
index a07b81b2..e96cc771 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -15,7 +15,9 @@ cmake -G Ninja \
   -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/plugins \
+-I$INSTALL_PREFIX/include/WPEFramework/interfaces"
 
 cmake --build build/xdialserver

From 73121117b1360042c73a808cab3197cc3241b957 Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 17:27:09 +0530
Subject: [PATCH 26/28] Update build_dependencies.sh

---
 build_dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 1611ae3c..5859f31c 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -13,7 +13,7 @@ mkdir -p "$INSTALL_PREFIX"
 # System dependencies (sudo REQUIRED in GitHub Actions)
 sudo apt update
 sudo apt install -y \
-  ninja-build meson cmake curl \
+  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

From 6575849940f37a23bc525d7131a7e1d5425de1cc Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Wed, 14 Jan 2026 17:28:15 +0530
Subject: [PATCH 27/28] Update build_dependencies.sh

---
 build_dependencies.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build_dependencies.sh b/build_dependencies.sh
index 5859f31c..20f5e39a 100755
--- a/build_dependencies.sh
+++ b/build_dependencies.sh
@@ -22,7 +22,7 @@ pip install jsonref
 
 ##############################
 # Build trower-base64
-git clone https://github.com/xmidt-org/trower-base64.git || true
+git clone https://github.com/xmidt-org/trower-base64.git
 cd trower-base64
 meson setup build --prefix="$INSTALL_PREFIX"
 ninja -C build
@@ -31,14 +31,14 @@ cd ..
 
 ##############################
 # Clone required repositories
-git clone https://github.com/rdkcentral/iarmbus.git || true
+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 || true
-git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git || true
-git clone --branch main https://github.com/rdkcentral/entservices-apis.git || true
-git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git || true
-git clone --branch gssdp-1.2.3 https://gitlab.gnome.org/GNOME/gssdp.git || true
+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

From b18ebbade32818278934b716440abf370b8630ba Mon Sep 17 00:00:00 2001
From: agampa263 <133222558+agampa263@users.noreply.github.com>
Date: Thu, 15 Jan 2026 10:34:20 +0530
Subject: [PATCH 28/28] Update cov_build.sh

---
 cov_build.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/cov_build.sh b/cov_build.sh
index e96cc771..cd6d5b20 100755
--- a/cov_build.sh
+++ b/cov_build.sh
@@ -2,13 +2,19 @@
 set -e
 set -x
 
+##############################
+# Paths
 GITHUB_WORKSPACE="${PWD}"
 INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
 
+##############################
+# 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"
 
+##############################
+# Build xdialserver (out-of-source)
 cmake -G Ninja \
   -S "$GITHUB_WORKSPACE/server" \
   -B build/xdialserver \
@@ -18,6 +24,10 @@ cmake -G Ninja \
 -I$INSTALL_PREFIX/include/WPEFramework \
 -I$INSTALL_PREFIX/include/WPEFramework/core \
 -I$INSTALL_PREFIX/include/WPEFramework/plugins \
--I$INSTALL_PREFIX/include/WPEFramework/interfaces"
+-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"
 
 cmake --build build/xdialserver