From 03646f5f2a0e4f27d1cd68a082371b99d4cae244 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:30:31 +0530 Subject: [PATCH 01/13] RDKB-63378 : Set the stackmode for single build --- .../apply_system_defaults.c | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index 0a589550..8b4ace56 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -662,6 +662,43 @@ static int set_syscfg_partner_values (char *pValue, char *param) } } +static int set_syscfg_stackmode(char *stackmode) +{ + if ((syscfg_set_commit(NULL, "stackmode", stackmode) != 0)) + { + APPLY_PRINT("set_syscfg_stackmode : syscfg_set failed for stackmode\n"); + return 1; + } + else + { + APPLY_PRINT("set_syscfg_stackmode : stackmode set to %s\n", stackmode); + return 0; + } +} + +static void override_partnerid_and_set_stackmode(char *PartnerID) +{ + char stackmode[32] = {0}; + + // Check if PartnerID is "comcastbusiness" + if (strncmp(PartnerID, "comcastbusiness", strlen("comcastbusiness")) == 0) + { + // Override PartnerID to "comcast" + sprintf(PartnerID, "%s", "comcast"); + sprintf(stackmode, "%s", "business"); + APPLY_PRINT("%s - PartnerID overridden from 'comcastbusiness' to 'comcast', stackmode set to 'business'\n", __FUNCTION__); + } + else + { + // Set stackmode to "residential" + sprintf(stackmode, "%s", "residential"); + APPLY_PRINT("%s - PartnerID unchanged: %s, stackmode set to 'residential'\n", __FUNCTION__, PartnerID); + } + + // Set the stackmode syscfg variable + set_syscfg_stackmode(stackmode); +} + static int GetDevicePropertiesEntry (char *pOutput, int size, char *sDevicePropContent) { FILE *fp1 = NULL; @@ -944,6 +981,10 @@ static int get_PartnerID (char *PartnerID) validatePartnerId ( PartnerID ); unlink("/nvram/.partner_ID"); } + + // Override PartnerID if needed and set stackmode + override_partnerid_and_set_stackmode(PartnerID); + set_syscfg_partner_values(PartnerID,"PartnerID"); //To print Facgtory PartnerID on every boot-up From 277bfd6b8e417e557b1069b4fdd381037116ed3d Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:51:25 +0530 Subject: [PATCH 02/13] RDKB-63378 : Set the stackmode for single build --- .../init/src/apply_system_defaults/apply_system_defaults.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index 8b4ace56..3b941db4 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -662,6 +662,7 @@ static int set_syscfg_partner_values (char *pValue, char *param) } } +#ifdef _ONESTACK_PRODUCT_REQ_ static int set_syscfg_stackmode(char *stackmode) { if ((syscfg_set_commit(NULL, "stackmode", stackmode) != 0)) @@ -698,6 +699,7 @@ static void override_partnerid_and_set_stackmode(char *PartnerID) // Set the stackmode syscfg variable set_syscfg_stackmode(stackmode); } +#endif // _ONESTACK_PRODUCT_REQ_ static int GetDevicePropertiesEntry (char *pOutput, int size, char *sDevicePropContent) { @@ -982,8 +984,10 @@ static int get_PartnerID (char *PartnerID) unlink("/nvram/.partner_ID"); } +#ifdef _ONESTACK_PRODUCT_REQ_ // Override PartnerID if needed and set stackmode override_partnerid_and_set_stackmode(PartnerID); +#endif // _ONESTACK_PRODUCT_REQ_ set_syscfg_partner_values(PartnerID,"PartnerID"); From cbb76508a67147ac9eb240bd1ffb0a09defb19ee Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Wed, 4 Feb 2026 16:49:37 +0530 Subject: [PATCH 03/13] RDKB-63378 : Set the stackmode for single build --- .../apply_system_defaults.c | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index 3b941db4..ab675481 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -663,41 +663,43 @@ static int set_syscfg_partner_values (char *pValue, char *param) } #ifdef _ONESTACK_PRODUCT_REQ_ -static int set_syscfg_stackmode(char *stackmode) +static int set_syscfg_devicemode(char *devicemode) { - if ((syscfg_set_commit(NULL, "stackmode", stackmode) != 0)) + if ((syscfg_set_commit(NULL, "devicemode", devicemode) != 0)) { - APPLY_PRINT("set_syscfg_stackmode : syscfg_set failed for stackmode\n"); + APPLY_PRINT("set_syscfg_devicemode : syscfg_set failed for devicemode\n"); return 1; } else { - APPLY_PRINT("set_syscfg_stackmode : stackmode set to %s\n", stackmode); + APPLY_PRINT("set_syscfg_devicemode : devicemode set to %s\n", devicemode); return 0; } } static void override_partnerid_and_set_stackmode(char *PartnerID) { - char stackmode[32] = {0}; + char devicemode[32] = {0}; + char original_partnerid[PARTNER_ID_LEN] = {0}; - // Check if PartnerID is "comcastbusiness" - if (strncmp(PartnerID, "comcastbusiness", strlen("comcastbusiness")) == 0) + // Check if PartnerID contains "business" (e.g., comcastbusiness, rogersbusiness, shawbusiness) + if (strstr(PartnerID, "business") != NULL) { + strncpy(original_partnerid, PartnerID, PARTNER_ID_LEN - 1); // Override PartnerID to "comcast" sprintf(PartnerID, "%s", "comcast"); - sprintf(stackmode, "%s", "business"); - APPLY_PRINT("%s - PartnerID overridden from 'comcastbusiness' to 'comcast', stackmode set to 'business'\n", __FUNCTION__); + sprintf(devicemode, "%s", "business"); + APPLY_PRINT("%s - PartnerID overridden from '%s' to 'comcast', devicemode set to 'business'\n", __FUNCTION__, original_partnerid); } else { - // Set stackmode to "residential" - sprintf(stackmode, "%s", "residential"); - APPLY_PRINT("%s - PartnerID unchanged: %s, stackmode set to 'residential'\n", __FUNCTION__, PartnerID); + // Set devicemode to "residential" + sprintf(devicemode, "%s", "residential"); + APPLY_PRINT("%s - PartnerID unchanged: %s, devicemode set to 'residential'\n", __FUNCTION__, PartnerID); } - // Set the stackmode syscfg variable - set_syscfg_stackmode(stackmode); + // Set the devicemode syscfg variable + set_syscfg_devicemode(devicemode); } #endif // _ONESTACK_PRODUCT_REQ_ @@ -984,12 +986,12 @@ static int get_PartnerID (char *PartnerID) unlink("/nvram/.partner_ID"); } + set_syscfg_partner_values(PartnerID,"PartnerID"); + #ifdef _ONESTACK_PRODUCT_REQ_ - // Override PartnerID if needed and set stackmode + // Override PartnerID if needed and set devicemode override_partnerid_and_set_stackmode(PartnerID); #endif // _ONESTACK_PRODUCT_REQ_ - - set_syscfg_partner_values(PartnerID,"PartnerID"); //To print Facgtory PartnerID on every boot-up memset(buf, 0, sizeof(buf)); From bbf8774204a9a4ed8dee9cd09356ad04859df717 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Wed, 4 Feb 2026 16:54:40 +0530 Subject: [PATCH 04/13] RDKB-63378 : Set the stackmode for single build --- .../init/src/apply_system_defaults/apply_system_defaults.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index ab675481..b37da3e6 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -677,7 +677,7 @@ static int set_syscfg_devicemode(char *devicemode) } } -static void override_partnerid_and_set_stackmode(char *PartnerID) +static void override_partnerid_and_set_devicemode(char *PartnerID) { char devicemode[32] = {0}; char original_partnerid[PARTNER_ID_LEN] = {0}; @@ -990,7 +990,7 @@ static int get_PartnerID (char *PartnerID) #ifdef _ONESTACK_PRODUCT_REQ_ // Override PartnerID if needed and set devicemode - override_partnerid_and_set_stackmode(PartnerID); + override_partnerid_and_set_devicemode(PartnerID); #endif // _ONESTACK_PRODUCT_REQ_ //To print Facgtory PartnerID on every boot-up From caf55b32f775979bc3efa1db47b657dbbe02d029 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:57:07 +0530 Subject: [PATCH 05/13] RDKB-63378 : Set the stackmode for single build --- .../src/apply_system_defaults/Makefile.am | 6 ++- .../apply_system_defaults.c | 46 +++---------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/source/scripts/init/src/apply_system_defaults/Makefile.am b/source/scripts/init/src/apply_system_defaults/Makefile.am index 6ee0e417..e7809250 100644 --- a/source/scripts/init/src/apply_system_defaults/Makefile.am +++ b/source/scripts/init/src/apply_system_defaults/Makefile.am @@ -21,7 +21,8 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = -I$(top_srcdir)/source/include \ -I$(top_srcdir)/source/util \ -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/dbus-1.0 \ - -I${PKG_CONFIG_SYSROOT_DIR}$(libdir)/dbus-1.0/include + -I${PKG_CONFIG_SYSROOT_DIR}$(libdir)/dbus-1.0/include \ + -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/onestackutils AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \ $(top_builddir)/source/sysevent/lib/libsysevent.la \ @@ -31,7 +32,8 @@ AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \ $(top_builddir)/source/utctx/lib/libutctx.la \ -ltelemetry_msgsender \ -lcjson \ - -lccsp_common $(DBUS_LIBS) + -lccsp_common $(DBUS_LIBS) \ + -lonestackutils if PLATFORM_HAL_SYNDICATION AM_LDFLAGS += "-lhal_platform -lsysevent -lutctx -lutapi -lhal_wifi" diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index b37da3e6..dc83ef80 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -59,6 +59,10 @@ #include #include "safec_lib_common.h" +#ifdef _ONESTACK_PRODUCT_REQ_ +#include +#endif + #include #define PARTNERS_INFO_FILE "/nvram/partners_defaults.json" #define PARTNERS_INFO_FILE_ETC "/etc/partners_defaults.json" @@ -663,44 +667,8 @@ static int set_syscfg_partner_values (char *pValue, char *param) } #ifdef _ONESTACK_PRODUCT_REQ_ -static int set_syscfg_devicemode(char *devicemode) -{ - if ((syscfg_set_commit(NULL, "devicemode", devicemode) != 0)) - { - APPLY_PRINT("set_syscfg_devicemode : syscfg_set failed for devicemode\n"); - return 1; - } - else - { - APPLY_PRINT("set_syscfg_devicemode : devicemode set to %s\n", devicemode); - return 0; - } -} - -static void override_partnerid_and_set_devicemode(char *PartnerID) -{ - char devicemode[32] = {0}; - char original_partnerid[PARTNER_ID_LEN] = {0}; - - // Check if PartnerID contains "business" (e.g., comcastbusiness, rogersbusiness, shawbusiness) - if (strstr(PartnerID, "business") != NULL) - { - strncpy(original_partnerid, PartnerID, PARTNER_ID_LEN - 1); - // Override PartnerID to "comcast" - sprintf(PartnerID, "%s", "comcast"); - sprintf(devicemode, "%s", "business"); - APPLY_PRINT("%s - PartnerID overridden from '%s' to 'comcast', devicemode set to 'business'\n", __FUNCTION__, original_partnerid); - } - else - { - // Set devicemode to "residential" - sprintf(devicemode, "%s", "residential"); - APPLY_PRINT("%s - PartnerID unchanged: %s, devicemode set to 'residential'\n", __FUNCTION__, PartnerID); - } - - // Set the devicemode syscfg variable - set_syscfg_devicemode(devicemode); -} +// Functions moved to libonestackutils shared library +// See: rdkb_common_utils/source/onestackutils/onestackutils.c #endif // _ONESTACK_PRODUCT_REQ_ static int GetDevicePropertiesEntry (char *pOutput, int size, char *sDevicePropContent) @@ -990,7 +958,7 @@ static int get_PartnerID (char *PartnerID) #ifdef _ONESTACK_PRODUCT_REQ_ // Override PartnerID if needed and set devicemode - override_partnerid_and_set_devicemode(PartnerID); + onestackutils_override_partnerid_and_set_devicemode(PartnerID); #endif // _ONESTACK_PRODUCT_REQ_ //To print Facgtory PartnerID on every boot-up From 61d4e3a5e5e5a247cc362e555a1e136ef7da4825 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:59:38 +0530 Subject: [PATCH 06/13] RDKB-63378 : Set the stackmode for single build --- .../init/src/apply_system_defaults/apply_system_defaults.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index dc83ef80..a734746e 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -666,11 +666,6 @@ static int set_syscfg_partner_values (char *pValue, char *param) } } -#ifdef _ONESTACK_PRODUCT_REQ_ -// Functions moved to libonestackutils shared library -// See: rdkb_common_utils/source/onestackutils/onestackutils.c -#endif // _ONESTACK_PRODUCT_REQ_ - static int GetDevicePropertiesEntry (char *pOutput, int size, char *sDevicePropContent) { FILE *fp1 = NULL; From 8f3b175329b43ccff9398a3550dd702df4630758 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Wed, 4 Feb 2026 18:02:29 +0530 Subject: [PATCH 07/13] RDKB-63378 : Set the stackmode for single build --- .../init/src/apply_system_defaults/apply_system_defaults.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index a734746e..d8397fb0 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -949,12 +949,13 @@ static int get_PartnerID (char *PartnerID) unlink("/nvram/.partner_ID"); } - set_syscfg_partner_values(PartnerID,"PartnerID"); - #ifdef _ONESTACK_PRODUCT_REQ_ // Override PartnerID if needed and set devicemode + // Must be called BEFORE set_syscfg_partner_values to ensure syscfg gets the correct PartnerID onestackutils_override_partnerid_and_set_devicemode(PartnerID); #endif // _ONESTACK_PRODUCT_REQ_ + + set_syscfg_partner_values(PartnerID,"PartnerID"); //To print Facgtory PartnerID on every boot-up memset(buf, 0, sizeof(buf)); From 7b2887ec6c25bb4aa74371ae96f100f533cef756 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Wed, 4 Feb 2026 20:16:46 +0530 Subject: [PATCH 08/13] RDKB-63378 : Set the stackmode for single build --- configure.ac | 7 +++++++ .../scripts/init/src/apply_system_defaults/Makefile.am | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 2b2e6e00..b3da6ca4 100644 --- a/configure.ac +++ b/configure.ac @@ -226,6 +226,13 @@ AC_ARG_ENABLE([hotspot], [enable_hotspot=true]) AM_CONDITIONAL([ENABLE_HOTSPOT_SERVICE], [test x$enable_hotspot = xtrue]) +# OneStack Utilities Support +AC_ARG_ENABLE([onestackutils], + AS_HELP_STRING([--enable-onestackutils], [Enable OneStack utilities library]), + [enable_onestackutils=$enableval], + [enable_onestackutils=no]) +AM_CONDITIONAL([BUILD_ONESTACKUTILS], [test "x$enable_onestackutils" = "xyes"]) + AC_CONFIG_FILES( Makefile source/Makefile diff --git a/source/scripts/init/src/apply_system_defaults/Makefile.am b/source/scripts/init/src/apply_system_defaults/Makefile.am index e7809250..03911c03 100644 --- a/source/scripts/init/src/apply_system_defaults/Makefile.am +++ b/source/scripts/init/src/apply_system_defaults/Makefile.am @@ -21,8 +21,7 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = -I$(top_srcdir)/source/include \ -I$(top_srcdir)/source/util \ -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/dbus-1.0 \ - -I${PKG_CONFIG_SYSROOT_DIR}$(libdir)/dbus-1.0/include \ - -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/onestackutils + -I${PKG_CONFIG_SYSROOT_DIR}$(libdir)/dbus-1.0/include AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \ $(top_builddir)/source/sysevent/lib/libsysevent.la \ @@ -32,8 +31,11 @@ AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \ $(top_builddir)/source/utctx/lib/libutctx.la \ -ltelemetry_msgsender \ -lcjson \ - -lccsp_common $(DBUS_LIBS) \ - -lonestackutils + -lccsp_common $(DBUS_LIBS) + +if BUILD_ONESTACKUTILS +AM_LDFLAGS += -lonestackutils +endif if PLATFORM_HAL_SYNDICATION AM_LDFLAGS += "-lhal_platform -lsysevent -lutctx -lutapi -lhal_wifi" From 4fb9bceb268bb56cbdc0845a6b10a1c971f9b5f5 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Thu, 5 Feb 2026 00:53:20 +0530 Subject: [PATCH 09/13] RDKB-63378 : Set the stackmode for single build --- configure.ac | 7 ------- source/scripts/init/src/apply_system_defaults/Makefile.am | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index b3da6ca4..2b2e6e00 100644 --- a/configure.ac +++ b/configure.ac @@ -226,13 +226,6 @@ AC_ARG_ENABLE([hotspot], [enable_hotspot=true]) AM_CONDITIONAL([ENABLE_HOTSPOT_SERVICE], [test x$enable_hotspot = xtrue]) -# OneStack Utilities Support -AC_ARG_ENABLE([onestackutils], - AS_HELP_STRING([--enable-onestackutils], [Enable OneStack utilities library]), - [enable_onestackutils=$enableval], - [enable_onestackutils=no]) -AM_CONDITIONAL([BUILD_ONESTACKUTILS], [test "x$enable_onestackutils" = "xyes"]) - AC_CONFIG_FILES( Makefile source/Makefile diff --git a/source/scripts/init/src/apply_system_defaults/Makefile.am b/source/scripts/init/src/apply_system_defaults/Makefile.am index 03911c03..d072e328 100644 --- a/source/scripts/init/src/apply_system_defaults/Makefile.am +++ b/source/scripts/init/src/apply_system_defaults/Makefile.am @@ -31,12 +31,9 @@ AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \ $(top_builddir)/source/utctx/lib/libutctx.la \ -ltelemetry_msgsender \ -lcjson \ + -lonestackutils \ -lccsp_common $(DBUS_LIBS) -if BUILD_ONESTACKUTILS -AM_LDFLAGS += -lonestackutils -endif - if PLATFORM_HAL_SYNDICATION AM_LDFLAGS += "-lhal_platform -lsysevent -lutctx -lutapi -lhal_wifi" endif From 191f811fc17ee08d2225a75e1d3e5ad1bbbeff75 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Thu, 5 Feb 2026 13:16:28 +0530 Subject: [PATCH 10/13] RDKB-63378 : Set the stackmode for single build --- configure.ac | 1 + source/scripts/init/src/apply_system_defaults/Makefile.am | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2b2e6e00..2e0fe039 100644 --- a/configure.ac +++ b/configure.ac @@ -95,6 +95,7 @@ AM_CONDITIONAL(CCSP_PLATFORM_BCM, test "x$CCSP_PLATFORM" = xbcm) AM_CONDITIONAL(CCSP_PLATFORM_INTEL_PUMA7, test "x$CCSP_PLATFORM" = xintel_puma7) AM_CONDITIONAL([MULTILAN_FEATURE], [test "$MULTILAN_FEATURE" = "yes"]) AM_CONDITIONAL([CPC_FIREWALL_ENABLE], [test "x$CPC_FIREWALL_ENABLE" = "xtrue"]) +AM_CONDITIONAL([ONESTACK_PRODUCT_REQ], [test "x$ONESTACK_PRODUCT_REQ" = "xtrue"]) # Checks for header files. AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) diff --git a/source/scripts/init/src/apply_system_defaults/Makefile.am b/source/scripts/init/src/apply_system_defaults/Makefile.am index d072e328..605fbd22 100644 --- a/source/scripts/init/src/apply_system_defaults/Makefile.am +++ b/source/scripts/init/src/apply_system_defaults/Makefile.am @@ -21,7 +21,8 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = -I$(top_srcdir)/source/include \ -I$(top_srcdir)/source/util \ -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/dbus-1.0 \ - -I${PKG_CONFIG_SYSROOT_DIR}$(libdir)/dbus-1.0/include + -I${PKG_CONFIG_SYSROOT_DIR}$(libdir)/dbus-1.0/include \ + -I${PKG_CONFIG_SYSROOT_DIR}$(includedir) AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \ $(top_builddir)/source/sysevent/lib/libsysevent.la \ @@ -31,9 +32,12 @@ AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \ $(top_builddir)/source/utctx/lib/libutctx.la \ -ltelemetry_msgsender \ -lcjson \ - -lonestackutils \ -lccsp_common $(DBUS_LIBS) +if ONESTACK_PRODUCT_REQ +AM_LDFLAGS += -L${PKG_CONFIG_SYSROOT_DIR}$(libdir) -lonestackutils +endif + if PLATFORM_HAL_SYNDICATION AM_LDFLAGS += "-lhal_platform -lsysevent -lutctx -lutapi -lhal_wifi" endif From 403ca72020980a537d9fb97bc485a4c3380a8261 Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Thu, 5 Feb 2026 17:04:11 +0530 Subject: [PATCH 11/13] RDKB-63378 : Set the stackmode for single build --- .../init/src/apply_system_defaults/apply_system_defaults.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index d8397fb0..9c5ff77b 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -952,7 +952,9 @@ static int get_PartnerID (char *PartnerID) #ifdef _ONESTACK_PRODUCT_REQ_ // Override PartnerID if needed and set devicemode // Must be called BEFORE set_syscfg_partner_values to ensure syscfg gets the correct PartnerID + APPLY_PRINT("%s - Calling onestackutils_override_partnerid_and_set_devicemode with PartnerID: %s\n", __FUNCTION__, PartnerID); onestackutils_override_partnerid_and_set_devicemode(PartnerID); + APPLY_PRINT("%s - onestackutils_override_partnerid_and_set_devicemode completed. PartnerID: %s\n", __FUNCTION__, PartnerID); #endif // _ONESTACK_PRODUCT_REQ_ set_syscfg_partner_values(PartnerID,"PartnerID"); From a958768537cf170388e9130b6d66fdcfa93b1f9a Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Thu, 5 Feb 2026 18:55:58 +0530 Subject: [PATCH 12/13] RDKB-63378 : Set the stackmode for single build --- .../apply_system_defaults.c | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index 9c5ff77b..76ddcf3a 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -893,6 +893,13 @@ static int get_PartnerID (char *PartnerID) if( ( 0 == getFactoryPartnerId( PartnerID ) ) && ( PartnerID [ 0 ] != '\0' ) ) { APPLY_PRINT("%s - PartnerID from HAL: %s\n",__FUNCTION__,PartnerID ); +#ifdef _ONESTACK_PRODUCT_REQ_ + // Override PartnerID if needed and set devicemode + // Must be called BEFORE set_syscfg_partner_values to ensure syscfg gets the correct PartnerID + APPLY_PRINT("%s - Calling onestackutils_override_partnerid_and_set_devicemode with PartnerID from HAL: %s\n", __FUNCTION__, PartnerID); + onestackutils_override_partnerid_and_set_devicemode(PartnerID); + APPLY_PRINT("%s - onestackutils_override_partnerid_and_set_devicemode completed. PartnerID from HAL: %s\n", __FUNCTION__, PartnerID); +#endif // _ONESTACK_PRODUCT_REQ_ validatePartnerId ( PartnerID ); } else @@ -945,18 +952,18 @@ static int get_PartnerID (char *PartnerID) sprintf( PartnerID, "%s", fileContent ); APPLY_PRINT("%s - PartnerID from File: %s\n",__FUNCTION__,PartnerID ); +#ifdef _ONESTACK_PRODUCT_REQ_ + // Override PartnerID if needed and set devicemode + // Must be called BEFORE set_syscfg_partner_values to ensure syscfg gets the correct PartnerID + APPLY_PRINT("%s - Calling onestackutils_override_partnerid_and_set_devicemode with PartnerID: %s\n", __FUNCTION__, PartnerID); + onestackutils_override_partnerid_and_set_devicemode(PartnerID); + APPLY_PRINT("%s - onestackutils_override_partnerid_and_set_devicemode completed. PartnerID: %s\n", __FUNCTION__, PartnerID); +#endif // _ONESTACK_PRODUCT_REQ_ + validatePartnerId ( PartnerID ); unlink("/nvram/.partner_ID"); } -#ifdef _ONESTACK_PRODUCT_REQ_ - // Override PartnerID if needed and set devicemode - // Must be called BEFORE set_syscfg_partner_values to ensure syscfg gets the correct PartnerID - APPLY_PRINT("%s - Calling onestackutils_override_partnerid_and_set_devicemode with PartnerID: %s\n", __FUNCTION__, PartnerID); - onestackutils_override_partnerid_and_set_devicemode(PartnerID); - APPLY_PRINT("%s - onestackutils_override_partnerid_and_set_devicemode completed. PartnerID: %s\n", __FUNCTION__, PartnerID); -#endif // _ONESTACK_PRODUCT_REQ_ - set_syscfg_partner_values(PartnerID,"PartnerID"); //To print Facgtory PartnerID on every boot-up From d0c5765040a0be1e3dfc725c2cd4b7282e5064ef Mon Sep 17 00:00:00 2001 From: Goutam Damodaran <140494857+GoutamD2905@users.noreply.github.com> Date: Fri, 6 Feb 2026 14:57:58 +0530 Subject: [PATCH 13/13] RDKB-63378 : Set the devicemode for single build --- source/scripts/init/src/apply_system_defaults/Makefile.am | 2 +- .../init/src/apply_system_defaults/apply_system_defaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/scripts/init/src/apply_system_defaults/Makefile.am b/source/scripts/init/src/apply_system_defaults/Makefile.am index 605fbd22..b7d3bdc3 100644 --- a/source/scripts/init/src/apply_system_defaults/Makefile.am +++ b/source/scripts/init/src/apply_system_defaults/Makefile.am @@ -35,7 +35,7 @@ AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \ -lccsp_common $(DBUS_LIBS) if ONESTACK_PRODUCT_REQ -AM_LDFLAGS += -L${PKG_CONFIG_SYSROOT_DIR}$(libdir) -lonestackutils +AM_LDFLAGS += -L${PKG_CONFIG_SYSROOT_DIR}$(libdir) -ldevicemode -lonestack_syscfg -lonestack_log endif if PLATFORM_HAL_SYNDICATION diff --git a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c index 76ddcf3a..65596924 100644 --- a/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c +++ b/source/scripts/init/src/apply_system_defaults/apply_system_defaults.c @@ -60,7 +60,7 @@ #include "safec_lib_common.h" #ifdef _ONESTACK_PRODUCT_REQ_ -#include +#include #endif #include