rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

Switch skill-query over to skill-ovos-common-query

This commit is contained in:
j1nx 2021-09-06 12:12:37 +02:00
parent 521c5a256e
commit b81763701b
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot-external/Config.in
View File

@ -233,6 +233,7 @@ menu "Mycroft A.I. Skills"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-news/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-osm/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-common-play/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-common-query/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-enclosure/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-homescreen/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-info/Config.in"
@ -241,7 +242,6 @@ menu "Mycroft A.I. Skills"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-volume/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-parrot/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-personal/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-query/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-reminder/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-simple-youtube/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-singing/Config.in"

2
buildroot-external/configs/rpi4_64-gui_defconfig
View File

@ -701,6 +701,7 @@ BR2_PACKAGE_MYCROFT_SKILL_JOKE=y
BR2_PACKAGE_MYCROFT_SKILL_NAPTIME=y
BR2_PACKAGE_MYCROFT_SKILL_NEWS=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_COMMON_PLAY=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_COMMON_QUERY=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_ENCLOSURE=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_HOMESCREEN=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_INFO=y
@ -709,7 +710,6 @@ BR2_PACKAGE_MYCROFT_SKILL_OVOS_SETUP=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_VOLUME=y
BR2_PACKAGE_MYCROFT_SKILL_PARROT=y
BR2_PACKAGE_MYCROFT_SKILL_PERSONAL=y
BR2_PACKAGE_MYCROFT_SKILL_QUERY=y
BR2_PACKAGE_MYCROFT_SKILL_REMINDER=y
BR2_PACKAGE_MYCROFT_SKILL_SIMPLE_YOUTUBE=y
BR2_PACKAGE_MYCROFT_SKILL_SINGING=y

7
buildroot-external/package/mycroft-skill-ovos-common-query/Config.in Normal file
View File

@ -0,0 +1,7 @@
config BR2_PACKAGE_MYCROFT_SKILL_OVOS_COMMON_QUERY
bool "mycroft-skill-ovos-common-query"
help
Skill Negotiating for the best source for
an answer via Common QA
https://github.com/OpenVoiceOS/skill-ovos-common-query

20
buildroot-external/package/mycroft-skill-ovos-common-query/mycroft-skill-ovos-common-query.mk Normal file
View File

@ -0,0 +1,20 @@
################################################################################
#
# mycroft-skill-query
#
################################################################################
MYCROFT_SKILL_OVOS_COMMON_QUERY_VERSION = 2189e60b204b9f8b96d7a64429627736b714f399
MYCROFT_SKILL_OVOS_COMMON_QUERY_SITE = git://github.com/OpenVoiceOS/skill-ovos-common-query
MYCROFT_SKILL_OVOS_COMMON_QUERY_SITE_METHOD = git
MYCROFT_SKILL_OVOS_COMMON_QUERY_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
MYCROFT_SKILL_OVOS_COMMON_QUERY_DIRNAME = skill-ovos-common-query.openvoiceos
define MYCROFT_SKILL_OVOS_COMMON_QUERY_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_COMMON_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_COMMON_QUERY_DIRNAME)
cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_COMMON_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_COMMON_QUERY_DIRNAME)
cp -dpfr $(MYCROFT_SKILL_OVOS_COMMON_QUERY_DL_DIR)/git/.git* \
$(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_COMMON_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_COMMON_QUERY_DIRNAME)
endef
$(eval $(generic-package))

7
buildroot-external/package/mycroft-skill-query/Config.in
View File

@ -1,7 +0,0 @@
config BR2_PACKAGE_MYCROFT_SKILL_QUERY
bool "mycroft-skill-query"
help
Skill Negotiating for the best source for
an answer via Common QA
https://github.com/MycroftAI/skill-query

20
buildroot-external/package/mycroft-skill-query/mycroft-skill-query.mk
View File

@ -1,20 +0,0 @@
################################################################################
#
# mycroft-skill-query
#
################################################################################
MYCROFT_SKILL_QUERY_VERSION = 8789731b6f0ba387039596fa64817549f12c35f5
MYCROFT_SKILL_QUERY_SITE = git://github.com/MycroftAI/skill-query
MYCROFT_SKILL_QUERY_SITE_METHOD = git
MYCROFT_SKILL_QUERY_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
MYCROFT_SKILL_QUERY_DIRNAME = skill-query.mycroftai
define MYCROFT_SKILL_QUERY_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_QUERY_DIRNAME)
cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_QUERY_DIRNAME)
cp -dpfr $(MYCROFT_SKILL_QUERY_DL_DIR)/git/.git* \
$(TARGET_DIR)/$(MYCROFT_SKILL_QUERY_DIRLOCATION)/$(MYCROFT_SKILL_QUERY_DIRNAME)
endef
$(eval $(generic-package))