Compare commits

...

5 Commits

Author SHA1 Message Date
j1nx b37481c91d Add data_dir to configuration 2022-02-03 12:03:10 +01:00
j1nx 1efd43f660 Rename config back to mycroft.conf 2022-02-03 12:01:45 +01:00
j1nx d7455d98a1 Switch mycroft settings over to ovos settings (and remove holmes) 2022-02-03 11:12:56 +01:00
j1nx 421efc8fe6 Bump ovos-core to latest dev 2022-02-03 10:58:22 +01:00
j1nx dcf39a3db4 Add additional packages and bump ddg and wolfie skill 2022-02-03 10:15:57 +01:00
27 changed files with 140 additions and 58 deletions

View File

@ -156,6 +156,12 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-msm/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-multi-key-dict/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-mycroft-messagebus-client/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-lang-plugin-libretranslate/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-solver-plugin-ddg/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-solver-plugin-wolfram-alpha/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-solvers/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-transformers/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-utterance-plugin-rake/Config.in"
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"

View File

@ -648,6 +648,12 @@ BR2_PACKAGE_PYTHON_MOCK_MSM=y
BR2_PACKAGE_PYTHON_MSK=y
BR2_PACKAGE_PYTHON_MULTI_KEY_DICT=y
BR2_PACKAGE_PYTHON_MYCROFT_MESSAGEBUS_CLIENT=y
BR2_PACKAGE_PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_DDG=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA=y
BR2_PACKAGE_PYTHON_NEON_SOLVERS=y
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

View File

@ -650,6 +650,12 @@ BR2_PACKAGE_PYTHON_MOCK_MSM=y
BR2_PACKAGE_PYTHON_MSK=y
BR2_PACKAGE_PYTHON_MULTI_KEY_DICT=y
BR2_PACKAGE_PYTHON_MYCROFT_MESSAGEBUS_CLIENT=y
BR2_PACKAGE_PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_DDG=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA=y
BR2_PACKAGE_PYTHON_NEON_SOLVERS=y
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

View File

@ -4,8 +4,8 @@
#
################################################################################
MYCROFT_SKILL_DDG_VERSION = 42753538e8fc15b38aec84bf44ecf1645c8bde95
MYCROFT_SKILL_DDG_SITE = https://github.com/JarbasSkills/skill-ddg
MYCROFT_SKILL_DDG_VERSION = c58f55ca45a48bb7ef44a61113fe3b144ef8f55a
MYCROFT_SKILL_DDG_SITE = https://github.com/NeonJarbas/skill-ddg
MYCROFT_SKILL_DDG_SITE_METHOD = git
MYCROFT_SKILL_DDG_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
MYCROFT_SKILL_DDG_DIRNAME = skill-ddg.jarbasskills

View File

@ -4,8 +4,8 @@
#
################################################################################
MYCROFT_SKILL_WOLFIE_VERSION = f81ae02ac0830662ba3a9425a1016de647db4c8a
MYCROFT_SKILL_WOLFIE_SITE = https://github.com/JarbasSkills/skill-wolfie
MYCROFT_SKILL_WOLFIE_VERSION = 8736018d95668ebe6c070111cabb3f1741ddfd79
MYCROFT_SKILL_WOLFIE_SITE = https://github.com/NeonJarbas/skill-wolfie
MYCROFT_SKILL_WOLFIE_SITE_METHOD = git
MYCROFT_SKILL_WOLFIE_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
MYCROFT_SKILL_WOLFIE_DIRNAME = skill-wolfie.jarbasskills

View File

@ -0,0 +1,7 @@
config BR2_PACKAGE_PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE
bool "python-neon-lang-plugin-libretranslate"
help
Language Plugin for LibreTranslate language
detection and translation
https://github.com/NeonGeckoCom/neon-lang-plugin-libretranslate

View File

@ -0,0 +1 @@
sha256 608545cc25d325e8c8c7611ebc4b010a64f9ef1150a5227248943f71b552a869 python-neon-lang-plugin-libretranslate-c071ea344c1fa9f2368c52d88ac0e2f3d64b938a.tar.gz

View File

@ -0,0 +1,12 @@
################################################################################
#
# python-neon-lang-plugin-libretranslate.mk
#
################################################################################
PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE_VERSION = c071ea344c1fa9f2368c52d88ac0e2f3d64b938a
PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE_SITE = $(call github,NeonGeckoCom,neon-lang-plugin-libretranslate,$(PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE_VERSION))
PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE_SETUP_TYPE = setuptools
PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE_LICENSE_FILES = LICENSE
$(eval $(python-package))

View File

@ -0,0 +1,6 @@
config BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_DDG
bool "python-neon-solver-plugin-ddg"
help
neon solver plugin ddg
https://github.com/NeonGeckoCom/neon-solver-plugin-ddg

View File

@ -0,0 +1 @@
sha256 94486cd6f128306b8f6b6e9f71bba63309a85b28cad5461c0cb6522c3b467b6e python-neon-solver-plugin-ddg-0afd34a5c11dff119576707b3885f054adb9db91.tar.gz

View File

@ -0,0 +1,12 @@
################################################################################
#
# python-neon-solver-plugin-ddg
#
################################################################################
PYTHON_NEON_SOLVER_PLUGIN_DDG_VERSION = 0afd34a5c11dff119576707b3885f054adb9db91
PYTHON_NEON_SOLVER_PLUGIN_DDG_SITE = $(call github,NeonGeckoCom,neon-solver-plugin-ddg,$(PYTHON_NEON_SOLVER_PLUGIN_DDG_VERSION))
PYTHON_NEON_SOLVER_PLUGIN_DDG_SETUP_TYPE = setuptools
PYTHON_NEON_SOLVER_PLUGIN_DDG_LICENSE_FILES = LICENSE
$(eval $(python-package))

View File

@ -0,0 +1,6 @@
config BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA
bool "python-neon-solver-plugin-wolfram-alpha"
help
neon solver plugin wolfram alpha
https://github.com/NeonGeckoCom/neon-solver-plugin-wolfram_alpha

View File

@ -0,0 +1 @@
sha256 b737a4e12e4b687c8a8c905830d7e9af31d4ff2910462a109224d81d7002371e python-neon-solver-plugin-wolfram-alpha-10f163f23bda9a123c89c11dfbcdf3ae804569f1.tar.gz

View File

@ -0,0 +1,12 @@
################################################################################
#
# python-neon-solver-plugin-wolfram-alpha
#
################################################################################
PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA_VERSION = 10f163f23bda9a123c89c11dfbcdf3ae804569f1
PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA_SITE = $(call github,NeonGeckoCom,neon-solver-plugin-wolfram_alpha,$(PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA_VERSION))
PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA_SETUP_TYPE = setuptools
PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA_LICENSE_FILES = LICENSE
$(eval $(python-package))

View File

@ -0,0 +1,6 @@
config BR2_PACKAGE_PYTHON_NEON_SOLVERS
bool "python-neon-solvers"
help
neon solvers package
https://github.com/NeonGeckoCom/neon_solvers

View File

@ -0,0 +1 @@
sha256 96d2a151d4c0e428340e3a79863587d8619022138ddfb58cc323f90fe4fca418 python-neon-solvers-b593b8ae9a7e7eae3b515940fa671d6a03956555.tar.gz

View File

@ -0,0 +1,12 @@
################################################################################
#
# python-neon-solvers
#
################################################################################
PYTHON_NEON_SOLVERS_VERSION = b593b8ae9a7e7eae3b515940fa671d6a03956555
PYTHON_NEON_SOLVERS_SITE = $(call github,NeonGeckoCom,neon_solvers,$(PYTHON_NEON_SOLVERS_VERSION))
PYTHON_NEON_SOLVERS_SETUP_TYPE = setuptools
PYTHON_NEON_SOLVERS_LICENSE_FILES = LICENSE
$(eval $(python-package))

View File

@ -0,0 +1,6 @@
config BR2_PACKAGE_PYTHON_NEON_TRANSFORMERS
bool "python-neon-transformers"
help
neon Utterance Transformers
https://github.com/NeonGeckoCom/neon-transformers

View File

@ -0,0 +1 @@
sha256 490bf798030dca521c1e3d44e9131d0231cd9ec6bc4f1718c13011438b649ddb python-neon-transformers-916c55f86f5ef5db82f6e53f50945a037faeaf2b.tar.gz

View File

@ -0,0 +1,12 @@
################################################################################
#
# python-neon-transformers
#
################################################################################
PYTHON_NEON_TRANSFORMERS_VERSION = 916c55f86f5ef5db82f6e53f50945a037faeaf2b
PYTHON_NEON_TRANSFORMERS_SITE = $(call github,NeonGeckoCom,neon-transformers,$(PYTHON_NEON_TRANSFORMERS_VERSION))
PYTHON_NEON_TRANSFORMERS_SETUP_TYPE = setuptools
PYTHON_NEON_TRANSFORMERS_LICENSE_FILES = LICENSE
$(eval $(python-package))

View File

@ -0,0 +1,6 @@
config BR2_PACKAGE_PYTHON_NEON_UTTERANCE_PLUGIN_RAKE
bool "python-neon-utterance-plugin-rake"
help
neon utterance rake plugin
https://github.com/NeonGeckoCom/neon-utterance-plugin-RAKE

View File

@ -0,0 +1 @@
sha256 6b814c593be4bf9f1de447ef423117e8dfea971b52e62a12c91e4493d38f2715 python-neon-utterance-plugin-rake-62df5b1a1d88336dafce903022896ef53521784f.tar.gz

View File

@ -0,0 +1,12 @@
################################################################################
#
# python-neon-utterance-plgin-rake
#
################################################################################
PYTHON_NEON_UTTERANCE_PLUGIN_RAKE_VERSION = 62df5b1a1d88336dafce903022896ef53521784f
PYTHON_NEON_UTTERANCE_PLUGIN_RAKE_SITE = $(call github,NeonGeckoCom,neon-utterance-plugin-RAKE,$(PYTHON_NEON_UTTERANCE_PLUGIN_RAKE_VERSION))
PYTHON_NEON_UTTERANCE_PLUGIN_RAKE_SETUP_TYPE = setuptools
PYTHON_NEON_UTTERANCE_PLUGIN_RAKE_LICENSE_FILES = LICENSE
$(eval $(python-package))

View File

@ -1 +1 @@
sha256 0426f867bcb34d78b393a3614909c6196f00defc464030aa252316167ab58c0f python-ovos-core-812874224ae4b9b97fec64cfc64607570e82b75c.tar.gz
sha256 6b322c4264614a9aaefc6f844484b83e373f435d5483a02bfd77d76f18d35484 python-ovos-core-0e3e2b886465121b3b351b3424132aa620e58558.tar.gz

View File

@ -4,7 +4,7 @@
#
################################################################################
PYTHON_OVOS_CORE_VERSION = 812874224ae4b9b97fec64cfc64607570e82b75c
PYTHON_OVOS_CORE_VERSION = 0e3e2b886465121b3b351b3424132aa620e58558
PYTHON_OVOS_CORE_SITE = $(call github,OpenVoiceOS,ovos-core,$(PYTHON_OVOS_CORE_VERSION))
PYTHON_OVOS_CORE_SETUP_TYPE = setuptools
PYTHON_OVOS_CORE_LICENSE_FILES = LICENSE

View File

@ -1,48 +0,0 @@
{
// check xdg directories OR only check old style hardcoded paths
// the default value is False so the default behaviour is the same as mycroft-core
// once MycroftAI/mycroft-core/pull/2794 is merged the default value will change to True
"xdg": true,
// the "name of the core",
// eg, OVOS, Neon, Chatterbox...
// all XDG paths should respect this
// {xdg_path}/{base_folder}/some_resource
// "mycroft.conf" default paths are derived from this
// /opt/{base_folder}/mycroft.conf
// ~/.{base_folder}/mycroft.conf
"base_folder": "mycroft",
// the filename of "mycroft.conf",
// eg, ovos.conf, chatterbox.conf, neon.conf...
// "mycroft.conf" default paths are derived from this
// /opt/{base_folder}/{config_filename}
// ~/.{base_folder}/{config_filename}
"config_filename": "mycroft.conf"
// override the default.conf location, allows changing the default values
// eg, disable backend, disable skills, configure permissions
//"default_config_path": "/etc/HolmesV/default_mycroft.conf",
// this is intended for derivative products, if a module name is present
// in sys.modules then the values below will be used instead
// eg, chatterbox/mycroft/ovos/neon can coexist in the same machine
//"module_overrides": {
// "chatterbox": {
// "xdg": false,
// "base_folder": "chatterbox",
// "config_filename": "chatterbox.conf",
// "default_config_path": "/opt/chatterbox/chatterbox.conf"
// },
// "ovos": {
// "xdg": true,
// "base_folder": "ovos",
// "config_filename": "ovos.conf"
// },
// "neon": {
// "xdg": true,
// "base_folder": "neon",
// "config_filename": "neon.conf"
// }
//}
}

View File

@ -2,6 +2,7 @@
"confirm_listening": true,
"play_wav_cmdline": "paplay %1",
"play_mp3_cmdline": "mpg123 %1",
"data_dir": "/home/mycroft/.local/share/mycroft",
"ipc_path": "/dev/shm/mycroft/ipc/",
"enclosure": {
"platform": "OpenVoiceOS",
@ -41,11 +42,7 @@
},
"skills": {
"wait_for_internet": true,
"msm": {
"disabled": true
},
"upload_skill_manifest": false,
"auto_update": false,
"blacklisted_skills": [
"mycroft-pairing.mycroftai",
"mycroft-volume.mycroftai",