Merge branch 'main' into R4

Author: Divya-563

package/ccspcr/0001-ccspcr-build-support.patch

@@ -49,17 +49,3 @@ index 9320169..a1639ff 100644
 +#endif
    pthread_exit(NULL);
  }
- 
-diff --git a/source/Makefile.am b/source/Makefile.am
-index 0b60f65..aeb6c09 100644
---- a/source/Makefile.am
-+++ b/source/Makefile.am
-@@ -44,7 +44,7 @@ CcspCrSsp_SOURCES = \
- 	CCSP_CR/ccsp_cr_profile.c \
- 	CCSP_CR/ccsp_cr_session.c \
- 	CCSP_CR/ccsp_cr_utility.c
--CcspCrSsp_LDFLAGS += -lccsp_common -lsyscfg -ltelemetry_msgsender -lprivilege $(SYSTEMD_LDFLAGS) -lpthread
-+CcspCrSsp_LDFLAGS += -lccsp_common -ldbus-1 -ltelemetry_msgsender -lprivilege $(SYSTEMD_LDFLAGS) -lpthread
- if RBUS_BUILD_INTEGRATED
- CcspCrSsp_SOURCES += CrSsp/ssp_rbus.c
- CcspCrSsp_LDFLAGS += -lrbus -lrbus-core -lrtMessage -lxml2

package/ccspcr/S35ccspcr

@@ -3,17 +3,16 @@
 start() {
     printf "Starting WebPA CcspCR module: "
 
-    ln -s /usr/ccsp/ccsp_msg.cfg /tmp/ccsp_msg.cfg
+    ln -sf /usr/ccsp/ccsp_msg.cfg /tmp/ccsp_msg.cfg
     rm -rf /tmp/syscfg.shmid
     syscfg_create -f /usr/ccsp/syscfg.db
-    CcspCrSsp -subsys eRT.
+    start-stop-daemon -S -q -b --exec /usr/bin/CcspCrSsp -- -subsys eRT. </dev/null >/dev/nul
     [ $? == 0 ] && echo "OK" || echo "FAIL"
 }
 
 stop() {
     printf "Stopping WebPA CcspCR module: "
-
-    killall -9 CcspCrSsp
+    start-stop-daemon -K -q --exec /usr/bin/CcspCrSsp
     [ $? == 0 ] && echo "OK" || echo "FAIL"
 }
 

package/ccspcr/ccspcr.mk

@@ -23,6 +23,7 @@ CCSPCR_CONF_OPTS = \
     --docdir=$(STAGING_DIR)/usr/share/doc \
     --with-ccsp-platform=bcm \
     --with-ccsp-arch=arm \
+    --with-rbus-build=only \
     $(CUSTOM_HOST)
 
 CCSPCR_CPPFLAGS = $(TARGET_CXXFLAGS) -I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include -I$(STAGING_DIR)/usr/include/ccsp -I$(STAGING_DIR)/usr/include/libxml2 -I$(STAGING_DIR)/usr/include/telemetry -I$(STAGING_DIR)/usr/include/rbus -D_DEBUG

package/dbus/1.12.16/tmpdir.patch.bkp

@@ -21,11 +21,6 @@ define HOST_LZ4_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) lz4
 endef
 
-define HOST_LZ4_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX=$(HOST_DIR) \
-		install -C $(@D)
-endef
-
 define LZ4_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \
 		-C $(@D) lib

package/lz4/lz4.mk

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+start() {
+    printf "Starting RBusCore module: "
+
+    start-stop-daemon -S -b -m -p /var/run/rbus_session_mgr.pid --exec /usr/bin/rbus_session_mgr </dev/null >/dev/nul
+    [ $? == 0 ] && echo "OK" || echo "FAIL"
+}
+
+stop() {
+    printf "Stopping RBusCore module: "
+
+    start-stop-daemon -K -q -p /var/run/rbus_session_mgr.pid
+    [ $? == 0 ] && echo "OK" || echo "FAIL"
+    rm -rf /var/run/rbus_session_mgr.pid
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart|reload)
+		restart
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		exit 1
+esac
+exit $?

package/rbus-core/S30rbuscore

@@ -13,4 +13,9 @@ RBUS_CORE_DEPENDENCIES = rtmessage msgpack-c
 
 RBUS_CORE_CONF_OPTS = -DRBUS_ALWAYS_ON=ON
 
+define RBUS_CORE_INSTALL_INIT_SYSV
+    $(INSTALL) -m 0755 -D $(RBUS_CORE_PKGDIR)S30rbuscore \
+        $(TARGET_DIR)/etc/init.d/S30rbuscore
+endef
+
 $(eval $(cmake-package))

package/rbus-core/rbus-core.mk

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+start() {
+    printf "Starting RBus module: "
+
+    touch /nvram/rbus_support
+    start-stop-daemon -S -q -b -m -p /var/run/rtrouted.pid --exec /usr/bin/rtrouted </dev/null >/dev/nul
+    [ $? == 0 ] && echo "OK" || echo "FAIL"
+}
+
+stop() {
+    printf "Stopping RBus module: "
+
+    start-stop-daemon -K -q -p /var/run/rtrouted.pid
+    [ $? == 0 ] && echo "OK" || echo "FAIL"
+    rm -rf /var/run/rtrouted.pid
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart|reload)
+		restart
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}"
+		exit 1
+esac
+exit $?

package/rbus/S25rbus

@@ -11,4 +11,10 @@ RBUS_INSTALL_STAGING = YES
 RBUS_AUTORECONF = YES
 RBUS_DEPENDENCIES = rbus-core linenoise
 
+define RBUS_INSTALL_INIT_SYSV
+    mkdir -p $(TARGET_DIR)/nvram
+    $(INSTALL) -m 0755 -D $(RBUS_PKGDIR)S25rbus \
+        $(TARGET_DIR)/etc/init.d/S25rbus
+endef
+
 $(eval $(cmake-package))

package/rbus/rbus.mk

@@ -10,6 +10,7 @@ RTMESSAGE_SITE = https://code.rdkcentral.com/r/rdk/components/opensource/rtmessa
 RTMESSAGE_INSTALL_STAGING = YES
 RTMESSAGE_AUTORECONF = YES
 
+RTMESSAGE_DEPENDENCIES = cjson
 RTMESSAGE_CONF_OPTS += \
     -DRDKC_BUILD=OFF \
     -DENABLE_RDKLOGGER=OFF \