rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-06-05 22:19:21 +02:00
Code Issues Releases Wiki Activity

[All] Bump and switch to ovos-bus-server running on the host under RT priority

Browse Source
This commit is contained in:
j1nx
2024-01-07 15:19:09 +00:00
parent a30437ae3e
commit 2f3d930410
11 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container
View File

@ -5,8 +5,8 @@ After=network-online.target
Wants=network-online.target Wants=network-online.target
Wants=pipewire.service Wants=pipewire.service
After=pipewire.service After=pipewire.service
Wants=ovos_messagebus.service Wants=ovos-bus-server.service
After=ovos_messagebus.service After=ovos-bus-server.service
Wants=ovos_phal.service Wants=ovos_phal.service
After=ovos_phal.service After=ovos_phal.service

4
buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container
View File

@ -5,8 +5,8 @@ After=network-online.target
Wants=network-online.target Wants=network-online.target
Wants=pipewire.service Wants=pipewire.service
After=pipewire.service After=pipewire.service
Wants=ovos_messagebus.service Wants=ovos-bus-server.service
After=ovos_messagebus.service After=ovos-bus-server.service
Wants=ovos_phal.service Wants=ovos_phal.service
After=ovos_phal.service After=ovos_phal.service

4
buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container
View File

@ -5,8 +5,8 @@ After=network-online.target
Wants=network-online.target Wants=network-online.target
Wants=pipewire.service Wants=pipewire.service
After=pipewire.service After=pipewire.service
Wants=ovos_messagebus.service Wants=ovos-bus-server.service
After=ovos_messagebus.service After=ovos-bus-server.service
Wants=ovos_phal.service Wants=ovos_phal.service
After=ovos_phal.service After=ovos_phal.service

3
buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container
View File

@ -19,6 +19,3 @@ Volume=%h/ovos/tmp:/tmp
[Service] [Service]
TimeoutStartSec=900 TimeoutStartSec=900
Restart=always Restart=always
[Install]
WantedBy=multi-user.target default.target

4
buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container
View File

@ -5,8 +5,8 @@ After=network-online.target
Wants=network-online.target Wants=network-online.target
Wants=pipewire.service Wants=pipewire.service
After=pipewire.service After=pipewire.service
Wants=ovos_messagebus.service Wants=ovos-bus-server.service
After=ovos_messagebus.service After=ovos-bus-server.service
[Container] [Container]
ContainerName=ovos_phal ContainerName=ovos_phal

3
buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container
View File

@ -24,6 +24,3 @@ Volume=/dev:/dev:ro
[Service] [Service]
TimeoutStartSec=900 TimeoutStartSec=900
Restart=always Restart=always
[Install]
WantedBy=multi-user.target default.target

26
buildroot-external/package/ovos-bus-server/0001-Make-package-installable.patch
View File

@ -1,26 +0,0 @@
From 1a31e20944d730e098878bc6e41d3099dd670bae Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Mon, 9 Jan 2023 10:39:10 +0100
Subject: [PATCH 1/1] Make package installable
---
server/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index d7ad36b..ae3a4b4 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -34,5 +34,7 @@ include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/external")
add_library(jsoncpp STATIC ${PROJECT_SOURCE_DIR}/external/jsoncpp.cpp)
# Build the server executable
-add_executable(ovos-bus-server server.cpp WebsocketServer.cpp)
-target_link_libraries (ovos-bus-server jsoncpp)
+set(TARGET ovos-bus-server)
+add_executable(${TARGET} server.cpp WebsocketServer.cpp)
+target_link_libraries (${TARGET} jsoncpp)
+install(TARGETS ${TARGET} DESTINATION bin)
--
2.34.1

2
buildroot-external/package/ovos-bus-server/ovos-bus-server.hash
View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 2352676a4c1726d2febe7a39c920d5b8b26a5256913039c5e69beff5e5469d3e ovos-bus-server-6390bb787fad4660106577891ada6fa935b662d7.tar.gz sha256 622a1556feab5afeeb58f7ede58c7f92ad906eb098e9cb507568fe45d9a2df50 ovos-bus-server-2bd52c9703cf7fcf8d9730f1586cc1f005b459cd.tar.gz

2
buildroot-external/package/ovos-bus-server/ovos-bus-server.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
OVOS_BUS_SERVER_VERSION = 6390bb787fad4660106577891ada6fa935b662d7 OVOS_BUS_SERVER_VERSION = 2bd52c9703cf7fcf8d9730f1586cc1f005b459cd
OVOS_BUS_SERVER_SITE = $(call github,OpenVoiceOS,ovos-bus-server,$(OVOS_BUS_SERVER_VERSION)) OVOS_BUS_SERVER_SITE = $(call github,OpenVoiceOS,ovos-bus-server,$(OVOS_BUS_SERVER_VERSION))
OVOS_BUS_SERVER_LICENSE = Apache License 2.0 OVOS_BUS_SERVER_LICENSE = Apache License 2.0

1
buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset
View File

@ -11,6 +11,7 @@ enable smb.service
enable nmb.service enable nmb.service
enable mglru.service enable mglru.service
enable connectivity-check.service enable connectivity-check.service
enable ovos-bus-server.service
disable pipewire.service disable pipewire.service
disable wireplumber.service disable wireplumber.service

18
buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos-bus-server.service Normal file
View File

@ -0,0 +1,18 @@
[Unit]
Description=OVOS bus server
Before=multi-user.target
After=network.target
[Service]
Type=simple
StandardOutput=null
StandardError=null
ExecStart=/usr/bin/ovos-bus-server
Restart=always
StartLimitInterval=0
CPUSchedulingPolicy=fifo
CPUSchedulingPriority=49
[Install]
WantedBy=multi-user.target
RequiredBy=network.target