From 3ad444d8c9176c0cc3ac294fc270d84b0e90b5f6 Mon Sep 17 00:00:00 2001 From: j1nx Date: Fri, 27 May 2022 16:42:24 +0200 Subject: [PATCH] Switch to ovos-shell and bump it --- buildroot-external/Config.in | 4 +--- buildroot-external/configs/rpi3_64-gui_defconfig | 2 +- buildroot-external/configs/rpi4_64-gui_defconfig | 2 +- .../package/mycroft-embedded-shell/Config.in | 10 ---------- .../mycroft-embedded-shell.hash | 2 -- .../mycroft-embedded-shell.mk | 15 --------------- buildroot-external/package/ovos-shell/Config.in | 10 ++++++++++ .../package/ovos-shell/ovos-shell.hash | 2 ++ .../package/ovos-shell/ovos-shell.mk | 15 +++++++++++++++ 9 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 buildroot-external/package/mycroft-embedded-shell/Config.in delete mode 100644 buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.hash delete mode 100644 buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.mk create mode 100644 buildroot-external/package/ovos-shell/Config.in create mode 100644 buildroot-external/package/ovos-shell/ovos-shell.hash create mode 100644 buildroot-external/package/ovos-shell/ovos-shell.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 744db9b8..1461eaac 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -87,6 +87,7 @@ endmenu source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/lottie-qml/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ncpamixer/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" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/picotts/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/qt5ct/Config.in" @@ -235,13 +236,10 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ytmusicapi/Config.in" endmenu menu "Mycroft A.I. Personal Assistant" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-embedded-shell/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-gui/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-holmesv/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-cli-client/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-core/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-service/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-splash/Config.in" menu "Mycroft A.I. Plugins" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-audio-plugin-simple/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-config-assistant/Config.in" diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index a5cb3279..cce5d3d0 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -637,6 +637,7 @@ BR2_PACKAGE_LIBREM=y BR2_PACKAGE_LOTTIE_QML=y BR2_PACKAGE_NCPAMIXER=y BR2_PACKAGE_OVOS_DASHBOARD=y +BR2_PACKAGE_OVOS_SHELL=y BR2_PACKAGE_OVOS_SPLASH=y BR2_PACKAGE_PICOTTS=y BR2_PACKAGE_QT5CT=y @@ -727,7 +728,6 @@ BR2_PACKAGE_PYTHON_YAGMAIL=y BR2_PACKAGE_PYTHON_YOUTUBE_DL=y BR2_PACKAGE_PYTHON_YOUTUBE_SEARCHER=y BR2_PACKAGE_PYTHON_YT_DLP=y -BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y BR2_PACKAGE_MYCROFT_GUI=y BR2_PACKAGE_PYTHON_OVOS_CLI_CLIENT=y BR2_PACKAGE_PYTHON_OVOS_CORE=y diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index c9ecb959..ad9cf69c 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -638,6 +638,7 @@ BR2_PACKAGE_LIBREM=y BR2_PACKAGE_LOTTIE_QML=y BR2_PACKAGE_NCPAMIXER=y BR2_PACKAGE_OVOS_DASHBOARD=y +BR2_PACKAGE_OVOS_SHELL=y BR2_PACKAGE_OVOS_SPLASH=y BR2_PACKAGE_PICOTTS=y BR2_PACKAGE_QT5CT=y @@ -729,7 +730,6 @@ BR2_PACKAGE_PYTHON_YAGMAIL=y BR2_PACKAGE_PYTHON_YOUTUBE_DL=y BR2_PACKAGE_PYTHON_YOUTUBE_SEARCHER=y BR2_PACKAGE_PYTHON_YT_DLP=y -BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y BR2_PACKAGE_MYCROFT_GUI=y BR2_PACKAGE_PYTHON_OVOS_CLI_CLIENT=y BR2_PACKAGE_PYTHON_OVOS_CORE=y diff --git a/buildroot-external/package/mycroft-embedded-shell/Config.in b/buildroot-external/package/mycroft-embedded-shell/Config.in deleted file mode 100644 index a1f020a4..00000000 --- a/buildroot-external/package/mycroft-embedded-shell/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL - bool "mycroft-embedded-shell" - help - This is a mycroft gui app which is intended - to run on low power hardware either as "single - application" on a minimal wayland server or - with eglfs backend. - - https://github.com/notmart/mycroft-embedded-shell - diff --git a/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.hash b/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.hash deleted file mode 100644 index 2b2c7a67..00000000 --- a/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 35edafa868bc81eb2cb0acb6354289b0e6486160bbe1456d8e38e5b2be1a6b22 mycroft-embedded-shell-947c0dfa39e8781b1befec4084f5a75ebe4edca7.tar.gz diff --git a/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.mk b/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.mk deleted file mode 100644 index cf98db2b..00000000 --- a/buildroot-external/package/mycroft-embedded-shell/mycroft-embedded-shell.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# mycroft-embedded-shell -# -################################################################################ - -MYCROFT_EMBEDDED_SHELL_VERSION = 947c0dfa39e8781b1befec4084f5a75ebe4edca7 -MYCROFT_EMBEDDED_SHELL_SITE = $(call github,OpenVoiceOS,ovos-shell,$(MYCROFT_EMBEDDED_SHELL_VERSION)) -MYCROFT_EMBEDDED_SHELL_LICENSE = Apache License 2.0 - -MYCROFT_EMBEDDED_SHELL_INSTALL_STAGING = YES -MYCROFT_EMBEDDED_SHELL_DEPENDENCIES = host-pkgconf -MYCROFT_EMBEDDED_SHELL_SUPPORTS_IN_SOURCE_BUILD = NO - -$(eval $(cmake-package)) diff --git a/buildroot-external/package/ovos-shell/Config.in b/buildroot-external/package/ovos-shell/Config.in new file mode 100644 index 00000000..7ddceddd --- /dev/null +++ b/buildroot-external/package/ovos-shell/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_OVOS_SHELL + bool "ovos-shell" + help + This is a minimal shell which is intended + to run on low power hardware either as "single + application" on a minimal wayland server or + with eglfs backend. + + https://github.com/OpenVoiceOS/ovos-shell + diff --git a/buildroot-external/package/ovos-shell/ovos-shell.hash b/buildroot-external/package/ovos-shell/ovos-shell.hash new file mode 100644 index 00000000..6962cf09 --- /dev/null +++ b/buildroot-external/package/ovos-shell/ovos-shell.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 208936aab9e36707f46fbe5e1c9a8d0092d87adc80482b71a3d93740cffe29e0 ovos-shell-33bcc6720613ae81cc8a8996d7a241a062398788.tar.gz diff --git a/buildroot-external/package/ovos-shell/ovos-shell.mk b/buildroot-external/package/ovos-shell/ovos-shell.mk new file mode 100644 index 00000000..3922a22d --- /dev/null +++ b/buildroot-external/package/ovos-shell/ovos-shell.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# ovos-shell +# +################################################################################ + +OVOS_SHELL_VERSION = 33bcc6720613ae81cc8a8996d7a241a062398788 +OVOS_SHELL_SITE = $(call github,OpenVoiceOS,ovos-shell,$(OVOS_SHELL_VERSION)) +OVOS_SHELL_LICENSE = Apache License 2.0 + +OVOS_SHELL_INSTALL_STAGING = YES +OVOS_SHELL_DEPENDENCIES = host-pkgconf +OVOS_SHELL_SUPPORTS_IN_SOURCE_BUILD = NO + +$(eval $(cmake-package))