From bc43e63f8bb0200bc158ce5a087f2105c67a9438 Mon Sep 17 00:00:00 2001
From: Deepak-Rathn <deepak.rathn@gmail.com>
Date: Mon, 15 Jun 2026 20:25:23 +0000
Subject: [PATCH 1/3] Re-Structure the rdk-gdcs/rdkb_common_utils

Signed-off-by: Deepak-Rathn <deepak.rathn@gmail.com>
---
 source/firewall/Makefile.am                            | 10 +++++++++-
 source/scripts/init/c_registration/Makefile.am         |  5 +++--
 .../scripts/init/src/apply_system_defaults/Makefile.am |  2 +-
 source/service_ipv6/Makefile.am                        |  3 ++-
 source/service_routed/Makefile.am                      |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/source/firewall/Makefile.am b/source/firewall/Makefile.am
index 5e113f28..a06e4add 100644
--- a/source/firewall/Makefile.am
+++ b/source/firewall/Makefile.am
@@ -24,7 +24,7 @@ AM_LDFLAGS = -lccsp_common -lsecure_wrapper -lnetfilter_queue -lnfnetlink $(DBUS
 bin_PROGRAMS = firewall nfq_handler
 
 if ONESTACK_PRODUCT_REQ
-AM_LDFLAGS += -lrdkb_feature_mode_gate
+AM_LDFLAGS += -L${PKG_CONFIG_SYSROOT_DIR}$(libdir)
 endif
 
 firewall_SOURCES = firewall_ipv6.c firewall.c firewall_priv.c firewall_interface.c  firewall_ext.c firewall_utils.c
@@ -40,10 +40,18 @@ firewall_LDADD = $(top_builddir)/source/syscfg/lib/libsyscfg.la \
                  $(top_builddir)/source/ulog/libulog.la \
                  $(top_builddir)/source/util/utils/libutopiautil.la
 
+if ONESTACK_PRODUCT_REQ
+firewall_LDADD += -lrdkb_feature_mode_gate -lonestack_syscfg
+endif
+
 nfq_handler_LDADD = $(top_builddir)/source/syscfg/lib/libsyscfg.la \
                     $(top_builddir)/source/sysevent/lib/libsysevent.la \
                     $(top_builddir)/source/ulog/libulog.la
 
+if ONESTACK_PRODUCT_REQ
+nfq_handler_LDADD += -lrdkb_feature_mode_gate -lonestack_syscfg
+endif
+
 if CORE_NET_LIB_FEATURE_SUPPORT
 AM_LDFLAGS += -lnet
 endif
diff --git a/source/scripts/init/c_registration/Makefile.am b/source/scripts/init/c_registration/Makefile.am
index a39bee3a..b256dbc3 100644
--- a/source/scripts/init/c_registration/Makefile.am
+++ b/source/scripts/init/c_registration/Makefile.am
@@ -33,7 +33,8 @@ AM_LDFLAGS = $(top_builddir)/source/util/utils/libutopiautil.la \
 LDFLAGS += -lsecure_wrapper
 
 if ONESTACK_PRODUCT_REQ
-AM_LDFLAGS += -ldevicemode
+LDFLAGS +=  -L${PKG_CONFIG_SYSROOT_DIR}$(libdir)
+LDADD = -ldevicemode -ltelemetry_msgsender
 endif
 
 bin_PROGRAMS = \
@@ -137,5 +138,5 @@ if ENABLE_HOTSPOT_SERVICE
 15_hotspot_SOURCES = 15_hotspot.c
 endif
 if ONESTACK_PRODUCT_REQ
-LDFLAGS += -lrdkb_feature_mode_gate
+LDADD += -lrdkb_feature_mode_gate -lonestack_syscfg
 endif
diff --git a/source/scripts/init/src/apply_system_defaults/Makefile.am b/source/scripts/init/src/apply_system_defaults/Makefile.am
index 4170a0c1..378ebb1a 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) -ldevicemode -lonestack_syscfg -lonestack_log -lonestack_init
+apply_system_defaults_LDADD =  -L${PKG_CONFIG_SYSROOT_DIR}$(libdir) -ldevicemode -lonestack_syscfg -lonestack_log -lonestack_init
 endif
 
 if PLATFORM_HAL_SYNDICATION
diff --git a/source/service_ipv6/Makefile.am b/source/service_ipv6/Makefile.am
index 75f0aee3..54e914d2 100644
--- a/source/service_ipv6/Makefile.am
+++ b/source/service_ipv6/Makefile.am
@@ -38,5 +38,6 @@ service_ipv6_LDFLAGS = -lnet
 endif
 
 if ONESTACK_PRODUCT_REQ
-service_ipv6_LDADD += -lrdkb_feature_mode_gate -ltelemetry_msgsender
+service_ipv6_LDFLAGS = -L${PKG_CONFIG_SYSROOT_DIR}${libdir}
+service_ipv6_LDADD += -lrdkb_feature_mode_gate -ltelemetry_msgsender -lonestack_syscfg
 endif
diff --git a/source/service_routed/Makefile.am b/source/service_routed/Makefile.am
index 2b537a86..ec52ecb0 100644
--- a/source/service_routed/Makefile.am
+++ b/source/service_routed/Makefile.am
@@ -46,7 +46,7 @@ service_routed_LDADD = $(top_builddir)/source/util/utils/libutopiautil.la \
                        -ltelemetry_msgsender
 service_routed_LDFLAGS = -L${PKG_CONFIG_SYSROOT_DIR}${libdir}
 if ONESTACK_PRODUCT_REQ
-service_routed_LDFLAGS += -lrdkb_feature_mode_gate
+service_routed_LDADD += -lrdkb_feature_mode_gate -lonestack_syscfg
 endif
 if CORE_NET_LIB_FEATURE_SUPPORT
 service_routed_LDFLAGS += -lnet

From d5420a03ee64463229eb8e7a867fb8d1fabf033c Mon Sep 17 00:00:00 2001
From: Deepak-Rathn <deepak.rathn@gmail.com>
Date: Tue, 16 Jun 2026 08:50:35 +0000
Subject: [PATCH 2/3] Re-Structure the rdk-gdcs/rdkb_common_utils

Signed-off-by: Deepak-Rathn <deepak.rathn@gmail.com>
---
 source/scripts/init/src/apply_system_defaults/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/scripts/init/src/apply_system_defaults/Makefile.am b/source/scripts/init/src/apply_system_defaults/Makefile.am
index 378ebb1a..70db2f31 100644
--- a/source/scripts/init/src/apply_system_defaults/Makefile.am
+++ b/source/scripts/init/src/apply_system_defaults/Makefile.am
@@ -35,7 +35,8 @@ AM_LDFLAGS = $(top_builddir)/source/services/lib/libsrvmgr.la \
 	         -lccsp_common $(DBUS_LIBS)
 
 if ONESTACK_PRODUCT_REQ
-apply_system_defaults_LDADD =  -L${PKG_CONFIG_SYSROOT_DIR}$(libdir) -ldevicemode -lonestack_syscfg -lonestack_log -lonestack_init
+AM_LDFLAGS += -L${PKG_CONFIG_SYSROOT_DIR}$(libdir)
+apply_system_defaults_LDADD =  -ldevicemode -lonestack_syscfg -lonestack_log -lonestack_init
 endif
 
 if PLATFORM_HAL_SYNDICATION

From 575b4e5e4905369fc12b3541d84cb936b48d23fa Mon Sep 17 00:00:00 2001
From: Deepak-Rathn <deepak.rathn@gmail.com>
Date: Tue, 16 Jun 2026 09:05:43 +0000
Subject: [PATCH 3/3] Re-Structure the rdk-gdcs/rdkb_common_utils

Signed-off-by: Deepak-Rathn <deepak.rathn@gmail.com>
---
 source/service_ipv6/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/service_ipv6/Makefile.am b/source/service_ipv6/Makefile.am
index 54e914d2..2295e9e7 100644
--- a/source/service_ipv6/Makefile.am
+++ b/source/service_ipv6/Makefile.am
@@ -33,11 +33,12 @@ service_ipv6_LDADD = $(top_builddir)/source/util/utils/libutopiautil.la \
                      $(top_builddir)/source/syscfg/lib/libsyscfg.la \
                      $(top_builddir)/source/ulog/libulog.la 
 
+service_ipv6_LDFLAGS =
 if CORE_NET_LIB_FEATURE_SUPPORT
-service_ipv6_LDFLAGS = -lnet
+service_ipv6_LDFLAGS += -lnet
 endif
 
 if ONESTACK_PRODUCT_REQ
-service_ipv6_LDFLAGS = -L${PKG_CONFIG_SYSROOT_DIR}${libdir}
+service_ipv6_LDFLAGS += -L${PKG_CONFIG_SYSROOT_DIR}${libdir}
 service_ipv6_LDADD += -lrdkb_feature_mode_gate -ltelemetry_msgsender -lonestack_syscfg
 endif