Switch to HolmesV

buildroot-external/Config.in

@@ -101,6 +101,7 @@ menu "Additional external python modules"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-cachetools/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-casttube/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-colour/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-combo-lock/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-convertdate/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-coverage/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-coveralls/Config.in"
@@ -176,9 +177,9 @@ menu "Additional external python modules"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-xxhash/Config.in"
 endmenu
 menu "Mycroft A.I. Personal Assistant"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-mycroft-lib/Config.in"
 	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/mycroft-service/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-splash/Config.in"
 menu "Mycroft A.I. Plugins"

buildroot-external/configs/rpi4_64-gui_defconfig

@@ -549,6 +549,7 @@ BR2_PACKAGE_XVF3510=y
 BR2_PACKAGE_PYTHON_ADAPT_PARSER=y
 BR2_PACKAGE_PYTHON_ASTRAL=y
 BR2_PACKAGE_PYTHON_COLOUR=y
+BR2_PACKAGE_PYTHON_COMBO_LOCK=y
 BR2_PACKAGE_PYTHON_COVERALLS=y
 BR2_PACKAGE_PYTHON_DEPRECATED=y
 BR2_PACKAGE_PYTHON_FEEDPARSER=y
@@ -592,9 +593,9 @@ BR2_PACKAGE_PYTHON_SOURCE=y
 BR2_PACKAGE_PYTHON_TZLOCAL=y
 BR2_PACKAGE_PYTHON_VLC=y
 BR2_PACKAGE_PYTHON_XMLRUNNER=y
-BR2_PACKAGE_PYTHON_MYCROFT_LIB=y
 BR2_PACKAGE_MYCROFT_EMBEDDED_SHELL=y
 BR2_PACKAGE_MYCROFT_GUI=y
+BR2_PACKAGE_PYTHON_HOLMESV=y
 BR2_PACKAGE_MYCROFT_SERVICE=y
 BR2_PACKAGE_PYTHON_JARBAS_STT_PLUGIN_CHROMIUM=y
 BR2_PACKAGE_PYTHON_JARBAS_STT_PLUGIN_VOSK=y

buildroot-external/package/python-combo-lock/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_COMBO_LOCK
+	bool "python-combo-lock"
+	help
+	  Python combo_lock package 
+
+	  https://pypi.org/project/combo-lock/

buildroot-external/package/python-combo-lock/python-combo-lock.hash

@@ -0,0 +1,3 @@
+# md5, sha256 from https://pypi.org/pypi/combo_lock/json
+md5  06afba70cbc75f8ef62d948cddfbd7d9  combo_lock-0.0.1.tar.gz
+sha256  fb4a6b6c3b646a99d9924745bdc4b06888983ecfcd05aa85e9954c9573073b96  combo_lock-0.0.1.tar.gz

buildroot-external/package/python-combo-lock/python-combo-lock.mk

@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-combo-lock
+#
+################################################################################
+
+PYTHON_COMBO_LOCK_VERSION = 0.0.1
+PYTHON_COMBO_LOCK_SOURCE = combo_lock-$(PYTHON_COMBO_LOCK_VERSION).tar.gz
+PYTHON_COMBO_LOCK_SITE = https://files.pythonhosted.org/packages/64/85/af22ffdcbb8c4f2a487e3afd23dfff8683defdd2da0dc1efbdd702fa9f4c
+PYTHON_COMBO_LOCK_SETUP_TYPE = setuptools
+PYTHON_COMBO_LOCK_LICENSE = apache-2.0
+
+$(eval $(python-package))

buildroot-external/package/python-holmesv/0001-Add-entry_points-to-install-binaries.patch

@@ -1,6 +1,6 @@
-From f44c0d90512660912920d7d7d0ec1801a336b716 Mon Sep 17 00:00:00 2001
+From c33439e2093fe832effcdbe4f04fb912140a40e2 Mon Sep 17 00:00:00 2001
 From: j1nx <p.steenbergen@j1nx.nl>
-Date: Wed, 14 Apr 2021 13:38:04 +0200
+Date: Sun, 16 May 2021 11:36:09 +0200
 Subject: [PATCH 1/1] Add entry_points for binaries
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH 1/1] Add entry_points for binaries
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 7c9f368d..87ab8618 100644
+index d8b11261..96feec0f 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -67,5 +67,18 @@ setup(
+@@ -87,5 +87,18 @@ setup(
  
      },
      packages=find_packages(include=['mycroft*']),

buildroot-external/package/python-holmesv/0002-Shut-up.patch

@@ -0,0 +1,25 @@
+From 24635b3feccacadfbc14151eb108eb92d2ca710e Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Sun, 16 May 2021 11:40:29 +0200
+Subject: [PATCH 1/1] Shut up
+
+---
+ mycroft/skills/skill_updater.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mycroft/skills/skill_updater.py b/mycroft/skills/skill_updater.py
+index 500e7168..ee7ab5c6 100644
+--- a/mycroft/skills/skill_updater.py
++++ b/mycroft/skills/skill_updater.py
+@@ -121,7 +121,7 @@ class SkillUpdater:
+         platform_default_skills = default_skill_groups.get(self.msm.platform)
+         if platform_default_skills is None:
+             log_msg = 'No default skills found for platform {}'
+-            LOG.info(log_msg.format(self.msm.platform))
++            #LOG.info(log_msg.format(self.msm.platform))
+         else:
+             default_skills.update(platform_default_skills)
+ 
+-- 
+2.20.1
+

buildroot-external/package/python-holmesv/0003-Set-version-to-OpenVoiceOS.patch

@@ -0,0 +1,25 @@
+From 9a4b0be48247d33c51e82a94bcfc175dbe666cfe Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Sun, 16 May 2021 11:43:32 +0200
+Subject: [PATCH 1/1] Set version to OpenVoiceOS
+
+---
+ mycroft/version/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mycroft/version/__init__.py b/mycroft/version/__init__.py
+index 7280ce64..f8e6b266 100644
+--- a/mycroft/version/__init__.py
++++ b/mycroft/version/__init__.py
+@@ -31,7 +31,7 @@ CORE_VERSION_BUILD = 1
+ CORE_VERSION_TUPLE = (CORE_VERSION_MAJOR,
+                       CORE_VERSION_MINOR,
+                       CORE_VERSION_BUILD)
+-CORE_VERSION_STR = '.'.join(map(str, CORE_VERSION_TUPLE)) + "(HolmesV)"
++CORE_VERSION_STR = '.'.join(map(str, CORE_VERSION_TUPLE)) + "(OpenVoiceOS)"
+ 
+ 
+ class VersionManager:
+-- 
+2.20.1
+

buildroot-external/package/python-holmesv/Config.in

@@ -1,5 +1,5 @@
-config BR2_PACKAGE_PYTHON_MYCROFT_LIB
+config BR2_PACKAGE_PYTHON_HOLMESV
-	bool "python-mycroft-lib"
+	bool "python-holmesv"
 	help
 	  Mycroft Core, the Mycroft Artificial Intelligence platform.
 	  packaged as importable library. 

buildroot-external/package/python-holmesv/python-holmesv.hash

@@ -0,0 +1 @@
+sha256  c2647e9bd49d64c30e6b173b781ccd2325a0bc61c90b8e9f8ed47fd150948616  python-holmesv-302277ec47185e1728ca7b08ef8a647d1102c585.tar.gz

buildroot-external/package/python-holmesv/python-holmesv.mk

@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-holmesv
+#
+################################################################################
+
+PYTHON_HOLMESV_VERSION = 302277ec47185e1728ca7b08ef8a647d1102c585
+PYTHON_HOLMESV_SITE = $(call github,HelloChatterbox,HolmesV,$(PYTHON_HOLMESV_VERSION))
+PYTHON_HOLMESV_SETUP_TYPE = setuptools
+PYTHON_HOLMESV_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))

buildroot-external/package/python-mycroft-lib/python-mycroft-lib.hash

@@ -1 +0,0 @@
-sha256  32e29c9ca31978c59072fbe48248cefa1a735e2586b32e4f21b5c746ee61bfbe  python-mycroft-lib-de69f365d513311eb1be18f6d149feaca67a18d3.tar.gz

buildroot-external/package/python-mycroft-lib/python-mycroft-lib.mk

@@ -1,12 +0,0 @@
-################################################################################
-#
-# python-mycroft-lib
-#
-################################################################################
-
-PYTHON_MYCROFT_LIB_VERSION = de69f365d513311eb1be18f6d149feaca67a18d3
-PYTHON_MYCROFT_LIB_SITE = $(call github,HelloChatterbox,mycroft-lib,$(PYTHON_MYCROFT_LIB_VERSION))
-PYTHON_MYCROFT_LIB_SETUP_TYPE = setuptools
-PYTHON_MYCROFT_LIB_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))