diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container index 31ce8618..0e230b19 100644 --- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container +++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_audio.container @@ -5,8 +5,8 @@ After=network-online.target Wants=network-online.target Wants=pipewire.service After=pipewire.service -Wants=ovos_messagebus.service -After=ovos_messagebus.service +Wants=ovos-bus-server.service +After=ovos-bus-server.service Wants=ovos_phal.service After=ovos_phal.service diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container index 7c2057b9..5a5ff959 100644 --- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container +++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_core.container @@ -5,8 +5,8 @@ After=network-online.target Wants=network-online.target Wants=pipewire.service After=pipewire.service -Wants=ovos_messagebus.service -After=ovos_messagebus.service +Wants=ovos-bus-server.service +After=ovos-bus-server.service Wants=ovos_phal.service After=ovos_phal.service diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container index 78fa2481..7f18d4bb 100644 --- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container +++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_listener.container @@ -5,8 +5,8 @@ After=network-online.target Wants=network-online.target Wants=pipewire.service After=pipewire.service -Wants=ovos_messagebus.service -After=ovos_messagebus.service +Wants=ovos-bus-server.service +After=ovos-bus-server.service Wants=ovos_phal.service After=ovos_phal.service diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container index a221b134..79d28654 100644 --- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container +++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_messagebus.container @@ -19,6 +19,3 @@ Volume=%h/ovos/tmp:/tmp [Service] TimeoutStartSec=900 Restart=always - -[Install] -WantedBy=multi-user.target default.target diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container index ec1d1966..98cc5186 100644 --- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container +++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal.container @@ -5,8 +5,8 @@ After=network-online.target Wants=network-online.target Wants=pipewire.service After=pipewire.service -Wants=ovos_messagebus.service -After=ovos_messagebus.service +Wants=ovos-bus-server.service +After=ovos-bus-server.service [Container] ContainerName=ovos_phal diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container index a33f8d16..4d82c4bf 100644 --- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container +++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/home/ovos/.config/containers/systemd/ovos_phal_admin.container @@ -24,6 +24,3 @@ Volume=/dev:/dev:ro [Service] TimeoutStartSec=900 Restart=always - -[Install] -WantedBy=multi-user.target default.target diff --git a/buildroot-external/package/ovos-bus-server/0001-Make-package-installable.patch b/buildroot-external/package/ovos-bus-server/0001-Make-package-installable.patch deleted file mode 100644 index a2a488e2..00000000 --- a/buildroot-external/package/ovos-bus-server/0001-Make-package-installable.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1a31e20944d730e098878bc6e41d3099dd670bae Mon Sep 17 00:00:00 2001 -From: j1nx -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 - diff --git a/buildroot-external/package/ovos-bus-server/ovos-bus-server.hash b/buildroot-external/package/ovos-bus-server/ovos-bus-server.hash index 24493b02..724879a0 100644 --- a/buildroot-external/package/ovos-bus-server/ovos-bus-server.hash +++ b/buildroot-external/package/ovos-bus-server/ovos-bus-server.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2352676a4c1726d2febe7a39c920d5b8b26a5256913039c5e69beff5e5469d3e ovos-bus-server-6390bb787fad4660106577891ada6fa935b662d7.tar.gz +sha256 622a1556feab5afeeb58f7ede58c7f92ad906eb098e9cb507568fe45d9a2df50 ovos-bus-server-2bd52c9703cf7fcf8d9730f1586cc1f005b459cd.tar.gz diff --git a/buildroot-external/package/ovos-bus-server/ovos-bus-server.mk b/buildroot-external/package/ovos-bus-server/ovos-bus-server.mk index 82470d96..3bec7adc 100644 --- a/buildroot-external/package/ovos-bus-server/ovos-bus-server.mk +++ b/buildroot-external/package/ovos-bus-server/ovos-bus-server.mk @@ -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_LICENSE = Apache License 2.0 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset index fe8ae1b9..99ab2c1c 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset @@ -11,6 +11,7 @@ enable smb.service enable nmb.service enable mglru.service enable connectivity-check.service +enable ovos-bus-server.service disable pipewire.service disable wireplumber.service diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos-bus-server.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos-bus-server.service new file mode 100644 index 00000000..7918bf63 --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/ovos-bus-server.service @@ -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