diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 4761c9ec..f1bfc3ed 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -98,6 +98,7 @@ endmenu source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ncpamixer/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/neon2sse/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/openfst/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ovos-bus-server/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ovos-dashboard/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ovos-shell/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ovos-splash/Config.in" diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index eaf9e1ce..a76d487c 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -585,6 +585,7 @@ BR2_PACKAGE_LIBRE=y BR2_PACKAGE_LIBREM=y BR2_PACKAGE_LOTTIE_QML=y BR2_PACKAGE_NCPAMIXER=y +BR2_PACKAGE_OVOS_BUS_SERVER=y BR2_PACKAGE_OVOS_DASHBOARD=y BR2_PACKAGE_OVOS_SHELL=y BR2_PACKAGE_OVOS_SPLASH=y diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 3eea10e0..09f3a854 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -585,6 +585,7 @@ BR2_PACKAGE_LIBRE=y BR2_PACKAGE_LIBREM=y BR2_PACKAGE_LOTTIE_QML=y BR2_PACKAGE_NCPAMIXER=y +BR2_PACKAGE_OVOS_BUS_SERVER=y BR2_PACKAGE_OVOS_DASHBOARD=y BR2_PACKAGE_OVOS_SHELL=y BR2_PACKAGE_OVOS_SPLASH=y 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 new file mode 100644 index 00000000..a2a488e2 --- /dev/null +++ b/buildroot-external/package/ovos-bus-server/0001-Make-package-installable.patch @@ -0,0 +1,26 @@ +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/Config.in b/buildroot-external/package/ovos-bus-server/Config.in new file mode 100644 index 00000000..aad59450 --- /dev/null +++ b/buildroot-external/package/ovos-bus-server/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_OVOS_BUS_SERVER + bool "ovos-bus-server" + help + alternative ovos bus service (websocket server) in C++ + + https://github.com/OpenVoiceOS/ovos-bus-server + diff --git a/buildroot-external/package/ovos-bus-server/ovos-bus-server.hash b/buildroot-external/package/ovos-bus-server/ovos-bus-server.hash new file mode 100644 index 00000000..24493b02 --- /dev/null +++ b/buildroot-external/package/ovos-bus-server/ovos-bus-server.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 2352676a4c1726d2febe7a39c920d5b8b26a5256913039c5e69beff5e5469d3e ovos-bus-server-6390bb787fad4660106577891ada6fa935b662d7.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 new file mode 100644 index 00000000..82470d96 --- /dev/null +++ b/buildroot-external/package/ovos-bus-server/ovos-bus-server.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# ovos-bus-server +# +################################################################################ + +OVOS_BUS_SERVER_VERSION = 6390bb787fad4660106577891ada6fa935b662d7 +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_INSTALL_STAGING = YES +OVOS_BUS_SERVER_DEPENDENCIES = host-pkgconf +OVOS_BUS_SERVER_SUPPORTS_IN_SOURCE_BUILD = NO +OVOS_BUS_SERVER_SUBDIR = server + +$(eval $(cmake-package))