From ed11ce7ec52d72bda47ce53f72ea2544b6de2563 Mon Sep 17 00:00:00 2001 From: j1nx Date: Fri, 7 Oct 2022 08:18:11 +0200 Subject: [PATCH] Add/Convert fallback unknown skill --- buildroot-external/Config.in | 2 +- .../configs/rpi4_64-gui_defconfig | 2 ++ .../package/mycroft-skill-unknown/Config.in | 7 ------- .../mycroft-skill-unknown.mk | 20 ------------------- .../skill-ovos-fallback-unknown/Config.in | 7 +++++++ .../skill-ovos-fallback-unknown.hash | 1 + .../skill-ovos-fallback-unknown.mk | 12 +++++++++++ 7 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 buildroot-external/package/mycroft-skill-unknown/Config.in delete mode 100644 buildroot-external/package/mycroft-skill-unknown/mycroft-skill-unknown.mk create mode 100644 buildroot-external/package/skill-ovos-fallback-unknown/Config.in create mode 100644 buildroot-external/package/skill-ovos-fallback-unknown/skill-ovos-fallback-unknown.hash create mode 100644 buildroot-external/package/skill-ovos-fallback-unknown/skill-ovos-fallback-unknown.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index f8fdbca7..1ece33d3 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -311,6 +311,7 @@ menu "Skills" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-news/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-osm/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-ovos-alarm/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-ovos-fallback-unknown/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-ovos-homescreen/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-ovos-info/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-ovos-notes/Config.in" @@ -321,7 +322,6 @@ menu "Skills" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-ovos-volume/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-parrot/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-ovos-personal/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-unknown/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-ovos-weather/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-wikipedia-for-humans/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/skill-wolfie/Config.in" diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 1375db6b..47190b25 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -737,7 +737,9 @@ BR2_PACKAGE_PYTHON_OVOS_WORKSHOP=y BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX=y BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE=y BR2_PACKAGE_SKILL_DDG=y +BR2_PACKAGE_SKILL_NAPTIME=y BR2_PACKAGE_SKILL_NEWS=y +BR2_PACKAGE_SKILL_OVOS_FALLBACK_UNKNOWN=y BR2_PACKAGE_SKILL_OVOS_HOMESCREEN=y BR2_PACKAGE_SKILL_OVOS_SETTINGS=y BR2_PACKAGE_SKILL_OVOS_SETUP=y diff --git a/buildroot-external/package/mycroft-skill-unknown/Config.in b/buildroot-external/package/mycroft-skill-unknown/Config.in deleted file mode 100644 index 8913c658..00000000 --- a/buildroot-external/package/mycroft-skill-unknown/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_MYCROFT_SKILL_UNKNOWN - bool "mycroft-skill-unknown" - help - Mycroft AI official Unknown Fallback Skill - - used if no Intent is matched to an Utterance - - https://github.com/MycroftAI/fallback-unknown diff --git a/buildroot-external/package/mycroft-skill-unknown/mycroft-skill-unknown.mk b/buildroot-external/package/mycroft-skill-unknown/mycroft-skill-unknown.mk deleted file mode 100644 index 82083c4d..00000000 --- a/buildroot-external/package/mycroft-skill-unknown/mycroft-skill-unknown.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# mycroft-skill-unknown -# -################################################################################ - -MYCROFT_SKILL_UNKNOWN_VERSION = de219550beccaaccb9310b200943ed5a2b2dbaf2 -MYCROFT_SKILL_UNKNOWN_SITE = https://github.com/MycroftAI/fallback-unknown -MYCROFT_SKILL_UNKNOWN_SITE_METHOD = git -MYCROFT_SKILL_UNKNOWN_DIRLOCATION = home/mycroft/.local/share/mycroft/skills -MYCROFT_SKILL_UNKNOWN_DIRNAME = fallback-unknown.mycroftai - -define MYCROFT_SKILL_UNKNOWN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_UNKNOWN_DIRLOCATION)/$(MYCROFT_SKILL_UNKNOWN_DIRNAME) - cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_UNKNOWN_DIRLOCATION)/$(MYCROFT_SKILL_UNKNOWN_DIRNAME) - cp -dpfr $(MYCROFT_SKILL_UNKNOWN_DL_DIR)/git/.git* \ - $(TARGET_DIR)/$(MYCROFT_SKILL_UNKNOWN_DIRLOCATION)/$(MYCROFT_SKILL_UNKNOWN_DIRNAME) -endef - -$(eval $(generic-package)) diff --git a/buildroot-external/package/skill-ovos-fallback-unknown/Config.in b/buildroot-external/package/skill-ovos-fallback-unknown/Config.in new file mode 100644 index 00000000..0cb3726a --- /dev/null +++ b/buildroot-external/package/skill-ovos-fallback-unknown/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_SKILL_OVOS_FALLBACK_UNKNOWN + bool "skill-ovos-fallback-unknown" + help + Mycroft AI official Unknown Fallback Skill - + used if no Intent is matched to an Utterance + + https://github.com/OpenVoiceOS/ovos-skill-fallback-unknown diff --git a/buildroot-external/package/skill-ovos-fallback-unknown/skill-ovos-fallback-unknown.hash b/buildroot-external/package/skill-ovos-fallback-unknown/skill-ovos-fallback-unknown.hash new file mode 100644 index 00000000..4b49d81c --- /dev/null +++ b/buildroot-external/package/skill-ovos-fallback-unknown/skill-ovos-fallback-unknown.hash @@ -0,0 +1 @@ +sha256 dd2571e17fa2604d031d3444e7e7665770dd2fb6f0176d63f0aacab6b02ec16c skill-ovos-fallback-unknown-2ce227adf319512ecd67897fb56f832d8656b981.tar.gz diff --git a/buildroot-external/package/skill-ovos-fallback-unknown/skill-ovos-fallback-unknown.mk b/buildroot-external/package/skill-ovos-fallback-unknown/skill-ovos-fallback-unknown.mk new file mode 100644 index 00000000..b716bcbe --- /dev/null +++ b/buildroot-external/package/skill-ovos-fallback-unknown/skill-ovos-fallback-unknown.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# skill-ovos-fallback-unknown +# +################################################################################ + +SKILL_OVOS_FALLBACK_UNKNOWN_VERSION = 2ce227adf319512ecd67897fb56f832d8656b981 +SKILL_OVOS_FALLBACK_UNKNOWN_SITE = $(call github,OpenVoiceOS,ovos-skill-fallback-unknown,$(SKILL_OVOS_FALLBACK_UNKNOWN_VERSION)) +SKILL_OVOS_FALLBACK_UNKNOWN_SETUP_TYPE = setuptools +SKILL_OVOS_FALLBACK_UNKNOWN_LICENSE_FILES = LICENSE + +$(eval $(python-package))