From 1ebf9194c86f2f45eee1a984401d4c4210d4ef8a Mon Sep 17 00:00:00 2001
From: j1nx
Date: Thu, 3 Mar 2022 10:57:11 +0100
Subject: [PATCH] Add package ovos-config-assistant
---
buildroot-external/Config.in | 19 ++++++++++---------
.../configs/rpi3_64-gui_defconfig | 17 +++++++++--------
.../configs/rpi4_64-gui_defconfig | 17 +++++++++--------
.../python-ovos-config-assistant/Config.in | 6 ++++++
.../python-ovos-config-assistant.hash | 1 +
.../python-ovos-config-assistant.mk | 12 ++++++++++++
6 files changed, 47 insertions(+), 25 deletions(-)
create mode 100644 buildroot-external/package/python-ovos-config-assistant/Config.in
create mode 100644 buildroot-external/package/python-ovos-config-assistant/python-ovos-config-assistant.hash
create mode 100644 buildroot-external/package/python-ovos-config-assistant/python-ovos-config-assistant.mk
diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 4d3c8979..45529eb6 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -165,15 +165,6 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-num2words/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-oauth2client/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-olefile/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-audio-plugin-simple/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-local-backend/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ocp-audio-plugin/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-plugin-manager/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-skill-installer/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-skill-manager/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-utils/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-vlc-plugin/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-workshop/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-padacioso/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-padaos/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-padatious/Config.in"
@@ -249,18 +240,28 @@ menu "Mycroft A.I. Personal Assistant"
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"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-local-backend/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-notifications-service/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ocp-audio-plugin/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal-plugin-connectivity-events/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal-plugin-display-manager-ipc/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal-plugin-ipc2bus/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-phal-plugin-mk1/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-plugin-manager/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-skill-installer/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-skill-manager/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-chromium/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-pocketsphinx/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-vosk/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic2/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-pico/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-utils/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-vlc-plugin/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-workshop/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ww-plugin-pocketsphinx/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ww-plugin-precise/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ww-plugin-precise-lite/Config.in"
diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig
index 1e8f9600..fe9ac04a 100644
--- a/buildroot-external/configs/rpi3_64-gui_defconfig
+++ b/buildroot-external/configs/rpi3_64-gui_defconfig
@@ -657,14 +657,6 @@ BR2_PACKAGE_PYTHON_NEON_TRANSFORMERS=y
BR2_PACKAGE_PYTHON_NEON_UTTERANCE_PLUGIN_RAKE=y
BR2_PACKAGE_PYTHON_OAUTH2CLIENT=y
BR2_PACKAGE_PYTHON_OLEFILE=y
-BR2_PACKAGE_PYTHON_OVOS_AUDIO_PLUGIN_SIMPLE=y
-BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y
-BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y
-BR2_PACKAGE_PYTHON_OVOS_SKILL_INSTALLER=y
-BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=y
-BR2_PACKAGE_PYTHON_OVOS_UTILS=y
-BR2_PACKAGE_PYTHON_OVOS_VLC_PLUGIN=y
-BR2_PACKAGE_PYTHON_OVOS_WORKSHOP=y
BR2_PACKAGE_PYTHON_PADACIOSO=y
BR2_PACKAGE_PYTHON_PADATIOUS=y
BR2_PACKAGE_PYTHON_PAFY=y
@@ -710,18 +702,27 @@ BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y
BR2_PACKAGE_MYCROFT_GUI=y
BR2_PACKAGE_PYTHON_OVOS_CORE=y
BR2_PACKAGE_MYCROFT_SERVICE=y
+BR2_PACKAGE_PYTHON_OVOS_AUDIO_PLUGIN_SIMPLE=y
+BR2_PACKAGE_PYTHON_OVOS_CONFIG_ASSISTANT=y
+BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y
BR2_PACKAGE_PYTHON_OVOS_NOTIFICATIONS_SERVICE=y
+BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y
BR2_PACKAGE_PYTHON_OVOS_PHAL=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_CONNECTIVITY_EVENTS=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DISPLAY_MANAGER_IPC=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_IPC2BUS=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_MK1=y
+BR2_PACKAGE_PYTHON_OVOS_SKILL_INSTALLER=y
+BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=y
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_CHROMIUM=y
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_POCKETSPHINX=y
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_VOSK=y
BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC=y
BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC2=y
BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_PICO=y
+BR2_PACKAGE_PYTHON_OVOS_UTILS=y
+BR2_PACKAGE_PYTHON_OVOS_VLC_PLUGIN=y
+BR2_PACKAGE_PYTHON_OVOS_WORKSHOP=y
BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX=y
BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE=y
BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE=y
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index c79afa08..b258a36e 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -659,14 +659,6 @@ BR2_PACKAGE_PYTHON_NEON_TRANSFORMERS=y
BR2_PACKAGE_PYTHON_NEON_UTTERANCE_PLUGIN_RAKE=y
BR2_PACKAGE_PYTHON_OAUTH2CLIENT=y
BR2_PACKAGE_PYTHON_OLEFILE=y
-BR2_PACKAGE_PYTHON_OVOS_AUDIO_PLUGIN_SIMPLE=y
-BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y
-BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y
-BR2_PACKAGE_PYTHON_OVOS_SKILL_INSTALLER=y
-BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=y
-BR2_PACKAGE_PYTHON_OVOS_UTILS=y
-BR2_PACKAGE_PYTHON_OVOS_VLC_PLUGIN=y
-BR2_PACKAGE_PYTHON_OVOS_WORKSHOP=y
BR2_PACKAGE_PYTHON_PADACIOSO=y
BR2_PACKAGE_PYTHON_PADATIOUS=y
BR2_PACKAGE_PYTHON_PAFY=y
@@ -712,18 +704,27 @@ BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y
BR2_PACKAGE_MYCROFT_GUI=y
BR2_PACKAGE_PYTHON_OVOS_CORE=y
BR2_PACKAGE_MYCROFT_SERVICE=y
+BR2_PACKAGE_PYTHON_OVOS_AUDIO_PLUGIN_SIMPLE=y
+BR2_PACKAGE_PYTHON_OVOS_CONFIG_ASSISTANT=y
+BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y
BR2_PACKAGE_PYTHON_OVOS_NOTIFICATIONS_SERVICE=y
+BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y
BR2_PACKAGE_PYTHON_OVOS_PHAL=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_CONNECTIVITY_EVENTS=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DISPLAY_MANAGER_IPC=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_IPC2BUS=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_MK1=y
+BR2_PACKAGE_PYTHON_OVOS_SKILL_INSTALLER=y
+BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=y
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_CHROMIUM=y
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_POCKETSPHINX=y
BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_VOSK=y
BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC=y
BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC2=y
BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_PICO=y
+BR2_PACKAGE_PYTHON_OVOS_UTILS=y
+BR2_PACKAGE_PYTHON_OVOS_VLC_PLUGIN=y
+BR2_PACKAGE_PYTHON_OVOS_WORKSHOP=y
BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX=y
BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE=y
BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE=y
diff --git a/buildroot-external/package/python-ovos-config-assistant/Config.in b/buildroot-external/package/python-ovos-config-assistant/Config.in
new file mode 100644
index 00000000..0452c080
--- /dev/null
+++ b/buildroot-external/package/python-ovos-config-assistant/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_OVOS_CONFIG_ASSISTANT
+ bool "python-ovos-config-assistant"
+ help
+ ovos config assistant library
+
+ https://github.com/OpenVoiceOS/ovos-config-assistant
diff --git a/buildroot-external/package/python-ovos-config-assistant/python-ovos-config-assistant.hash b/buildroot-external/package/python-ovos-config-assistant/python-ovos-config-assistant.hash
new file mode 100644
index 00000000..1651b301
--- /dev/null
+++ b/buildroot-external/package/python-ovos-config-assistant/python-ovos-config-assistant.hash
@@ -0,0 +1 @@
+sha256 ecf3e8a9609f836a261bb8d59886d352a4ac967215979f9e09102530351c62b5 python-ovos-config-assistant-ad0881569f6d0531a68bfd6687690103d927d14f.tar.gz
diff --git a/buildroot-external/package/python-ovos-config-assistant/python-ovos-config-assistant.mk b/buildroot-external/package/python-ovos-config-assistant/python-ovos-config-assistant.mk
new file mode 100644
index 00000000..1d011c45
--- /dev/null
+++ b/buildroot-external/package/python-ovos-config-assistant/python-ovos-config-assistant.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-ovos-config-assistant
+#
+################################################################################
+
+PYTHON_OVOS_CONFIG_ASSISTANT_VERSION = ad0881569f6d0531a68bfd6687690103d927d14f
+PYTHON_OVOS_CONFIG_ASSISTANT_SITE = $(call github,OpenVoiceOS,ovos-config-assistant,$(PYTHON_OVOS_CONFIG_ASSISTANT_VERSION))
+PYTHON_OVOS_CONFIG_ASSISTANT_SETUP_TYPE = setuptools
+PYTHON_OVOS_CONFIG_ASSISTANT_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))