Switch over to fully XDG compliant skills directories

buildroot-external/package/mycroft-skill-balena-wifi-setup/mycroft-skill-balena-wifi-setup.mk

@@ -7,7 +7,7 @@
 MYCROFT_SKILL_BALENA_WIFI_SETUP_VERSION = 7027f30fead898b86ad67c2348b3805af44adef3
 MYCROFT_SKILL_BALENA_WIFI_SETUP_SITE = git://github.com/OpenVoiceOS/skill-balena-wifi-setup
 MYCROFT_SKILL_BALENA_WIFI_SETUP_SITE_METHOD = git
-MYCROFT_SKILL_BALENA_WIFI_SETUP_DIRLOCATION = opt/mycroft/skills
+MYCROFT_SKILL_BALENA_WIFI_SETUP_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
 MYCROFT_SKILL_BALENA_WIFI_SETUP_DIRNAME = skill-balena-wifi-setup
 
 define MYCROFT_SKILL_BALENA_WIFI_SETUP_INSTALL_TARGET_CMDS

buildroot-external/package/mycroft-skill-date-time/mycroft-skill-date-time.mk

@@ -7,7 +7,7 @@
 MYCROFT_SKILL_DATE_TIME_VERSION = 20.08
 MYCROFT_SKILL_DATE_TIME_SITE = git://github.com/MycroftAI/skill-date-time
 MYCROFT_SKILL_DATE_TIME_SITE_METHOD = git
-MYCROFT_SKILL_DATE_TIME_DIRLOCATION = opt/mycroft/skills
+MYCROFT_SKILL_DATE_TIME_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
 MYCROFT_SKILL_DATE_TIME_DIRNAME = mycroft-date-time.mycroftai
 
 define MYCROFT_SKILL_DATE_TIME_INSTALL_TARGET_CMDS

buildroot-external/package/mycroft-skill-ovos-enclosure/mycroft-skill-ovos-enclosure.mk

@@ -7,7 +7,7 @@
 MYCROFT_SKILL_OVOS_ENCLOSURE_VERSION = 96f6b24faf146fb8811f0fdf753748991d414dcd
 MYCROFT_SKILL_OVOS_ENCLOSURE_SITE = git://github.com/OpenVoiceOS/skill-ovos-enclosure
 MYCROFT_SKILL_OVOS_ENCLOSURE_SITE_METHOD = git
-MYCROFT_SKILL_OVOS_ENCLOSURE_DIRLOCATION = opt/mycroft/skills
+MYCROFT_SKILL_OVOS_ENCLOSURE_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
 MYCROFT_SKILL_OVOS_ENCLOSURE_DIRNAME = skill-ovos-enclosure
 
 define MYCROFT_SKILL_OVOS_ENCLOSURE_INSTALL_TARGET_CMDS

buildroot-external/package/mycroft-skill-ovos-homescreen/mycroft-skill-ovos-homescreen.mk

@@ -7,7 +7,7 @@
 MYCROFT_SKILL_OVOS_HOMESCREEN_VERSION = cc2e3fdd5411908d73de295f1092ab9e937ffd94
 MYCROFT_SKILL_OVOS_HOMESCREEN_SITE = git://github.com/OpenVoiceOS/skill-ovos-homescreen
 MYCROFT_SKILL_OVOS_HOMESCREEN_SITE_METHOD = git
-MYCROFT_SKILL_OVOS_HOMESCREEN_DIRLOCATION = opt/mycroft/skills
+MYCROFT_SKILL_OVOS_HOMESCREEN_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
 MYCROFT_SKILL_OVOS_HOMESCREEN_DIRNAME = skill-ovos-homescreen
 
 define MYCROFT_SKILL_OVOS_HOMESCREEN_INSTALL_TARGET_CMDS

buildroot-external/package/mycroft-skill-ovos-mycroftgui/mycroft-skill-ovos-mycroftgui.mk

@@ -7,7 +7,7 @@
 MYCROFT_SKILL_OVOS_MYCROFTGUI_VERSION = 3f545b6356091cf73759f5fc0d48ffc55715d4fa
 MYCROFT_SKILL_OVOS_MYCROFTGUI_SITE = git://github.com/OpenVoiceOS/skill-ovos-mycroftgui
 MYCROFT_SKILL_OVOS_MYCROFTGUI_SITE_METHOD = git
-MYCROFT_SKILL_OVOS_MYCROFTGUI_DIRLOCATION = opt/mycroft/skills
+MYCROFT_SKILL_OVOS_MYCROFTGUI_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
 MYCROFT_SKILL_OVOS_MYCROFTGUI_DIRNAME = skill-ovos-mycroftgui
 
 define MYCROFT_SKILL_OVOS_MYCROFTGUI_INSTALL_TARGET_CMDS

buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk

@@ -7,7 +7,7 @@
 MYCROFT_SKILL_OVOS_PAIRING_VERSION = 9f9b37f169edd7387f4a73909bf1d9360b9fa7e1
 MYCROFT_SKILL_OVOS_PAIRING_SITE = git://github.com/OpenVoiceOS/skill-ovos-pairing
 MYCROFT_SKILL_OVOS_PAIRING_SITE_METHOD = git
-MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION = opt/mycroft/skills
+MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
 MYCROFT_SKILL_OVOS_PAIRING_DIRNAME = skill-ovos-pairing
 
 define MYCROFT_SKILL_OVOS_PAIRING_INSTALL_TARGET_CMDS

buildroot-external/package/mycroft-skill-ovos-volume/mycroft-skill-ovos-volume.mk

@@ -7,7 +7,7 @@
 MYCROFT_SKILL_OVOS_VOLUME_VERSION = 20.08
 MYCROFT_SKILL_OVOS_VOLUME_SITE = git://github.com/OpenVoiceOS/skill-ovos-volume
 MYCROFT_SKILL_OVOS_VOLUME_SITE_METHOD = git
-MYCROFT_SKILL_OVOS_VOLUME_DIRLOCATION = opt/mycroft/skills
+MYCROFT_SKILL_OVOS_VOLUME_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
 MYCROFT_SKILL_OVOS_VOLUME_DIRNAME = skill-ovos-volume
 
 define MYCROFT_SKILL_OVOS_VOLUME_INSTALL_TARGET_CMDS

buildroot-external/package/mycroft-skills-repo/mycroft-skills-repo.mk

@@ -8,7 +8,7 @@ MYCROFT_SKILLS_REPO_VERSION = 20.08
 MYCROFT_SKILLS_REPO_SITE = git://github.com/MycroftAI/mycroft-skills
 MYCROFT_SKILLS_REPO_SITE_METHOD = git
 #MYCROFT_SKILLS_REPO_GIT_SUBMODULES = yes
-MYCROFT_SKILLS_REPO_DIRLOCATION = opt/mycroft
+MYCROFT_SKILLS_REPO_DIRLOCATION = home/mycroft/.local/share/mycroft
 MYCROFT_SKILLS_REPO_DIRNAME = .skills-repo
 
 define MYCROFT_SKILLS_REPO_INSTALL_TARGET_CMDS

buildroot-external/package/python-mycroft/0002-Bump-msm-requirement-to-0.9.0.patch

@@ -1,25 +0,0 @@
-From db7d4937ad33bc4ae11b14fc4dafec5cb0f9b626 Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Sun, 4 Apr 2021 17:51:38 +0200
-Subject: [PATCH 1/1] Bump msm requirement to 0.9.0
-
----
- requirements/requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements/requirements.txt b/requirements/requirements.txt
-index dc5c5071cb..4e73baf9ba 100644
---- a/requirements/requirements.txt
-+++ b/requirements/requirements.txt
-@@ -16,7 +16,7 @@ fasteners==0.14.1
- PyYAML==5.4
- 
- lingua-franca==0.2.2
--msm==0.8.8
-+msm==0.9.0
- msk==0.3.16
- mycroft-messagebus-client==0.9.1
- adapt-parser==0.3.7
--- 
-2.20.1
-

buildroot-external/package/python-mycroft/0002-Read-skills-from-XDG-home-directory.patch

@@ -0,0 +1,314 @@
+From c95ca7898912749f1cbb4b6ffb0d0b9239eb9a46 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Mon, 5 Apr 2021 15:15:36 +0200
+Subject: [PATCH 1/1] Read skills from XDG home directory
+
+---
+ dev_setup.sh                                  | 23 +++++++++----------
+ mycroft/configuration/mycroft.conf            |  4 +---
+ mycroft/skills/msm_wrapper.py                 | 13 ++++-------
+ mycroft/skills/mycroft_skill/mycroft_skill.py |  2 +-
+ mycroft/skills/settings.py                    |  2 +-
+ mycroft/skills/skill_manager.py               |  9 ++++++--
+ mycroft/skills/skill_updater.py               |  4 +++-
+ pytest.ini                                    |  2 ++
+ requirements/requirements.txt                 |  2 +-
+ requirements/tests.txt                        |  1 +
+ test/unittests/base.py                        |  3 +++
+ test/unittests/skills/test_skill_manager.py   |  8 ++++---
+ 12 files changed, 41 insertions(+), 32 deletions(-)
+
+diff --git a/dev_setup.sh b/dev_setup.sh
+index 4290850bda..96bbbe9ff2 100755
+--- a/dev_setup.sh
++++ b/dev_setup.sh
+@@ -25,6 +25,12 @@ set -Ee
+ cd $(dirname $0)
+ TOP=$(pwd -L)
+ 
++if [ -n "${XDG_DATA_HOME+x}" ]; then
++	datadir="$XDG_DATA_HOME/mycroft"
++else
++	datadir="$HOME/.local/share/mycroft"
++fi
++
+ function clean_mycroft_files() {
+     echo '
+ This will completely remove any files installed by mycroft (including pairing
+@@ -34,6 +40,9 @@ Do you wish to continue? (y/n)'
+         read -N1 -s key
+         case $key in
+         [Yy])
++	    rm -r "$datadir"
++
++	    # Legacy locations
+             sudo rm -rf /var/log/mycroft
+             rm -f /var/tmp/mycroft_web_cache.json
+             rm -rf "${TMPDIR:-/tmp}/mycroft"
+@@ -258,20 +267,10 @@ fi" > ~/.profile_mycroft
+     # Create a link to the 'skills' folder.
+     sleep 0.5
+     echo
+-    echo 'The standard location for Mycroft skills is under /opt/mycroft/skills.'
+-    if [[ ! -d /opt/mycroft/skills ]] ; then
+-        echo 'This script will create that folder for you.  This requires sudo'
+-        echo 'permission and might ask you for a password...'
+-        setup_user=$USER
+-        setup_group=$(id -gn $USER)
+-        $SUDO mkdir -p /opt/mycroft/skills
+-        $SUDO chown -R ${setup_user}:${setup_group} /opt/mycroft
+-        echo 'Created!'
+-    fi
+     if [[ ! -d skills ]] ; then
+-        ln -s /opt/mycroft/skills skills
++        ln -s "$datadir"/skills skills
+         echo "For convenience, a soft link has been created called 'skills' which leads"
+-        echo 'to /opt/mycroft/skills.'
++        echo "to $datadir/skills."
+     fi
+ 
+     # Add PEP8 pre-commit hook
+diff --git a/mycroft/configuration/mycroft.conf b/mycroft/configuration/mycroft.conf
+index 02388be0d8..8040e94356 100644
+--- a/mycroft/configuration/mycroft.conf
++++ b/mycroft/configuration/mycroft.conf
+@@ -106,13 +106,11 @@
+       }
+     },
+     "upload_skill_manifest": true,
+-    // Directory to look for user skills
+-    "directory": "~/.mycroft/skills",
+     // Enable auto update by msm
+     "auto_update": true,
+     // blacklisted skills to not load
+     // NB: This is the basename() of the directory where the skill lives, so if
+-    // the skill you want to blacklist is in /opt/mycroft/skills/mycroft-alarm.mycroftai/
++    // the skill you want to blacklist is in /usr/share/mycroft/skills/mycroft-alarm.mycroftai/
+     // then you should write `["mycroft-alarm.mycroftai"]` below.
+     "blacklisted_skills": [],
+     // priority skills to be loaded first
+diff --git a/mycroft/skills/msm_wrapper.py b/mycroft/skills/msm_wrapper.py
+index 4f579f85ac..27753c678a 100644
+--- a/mycroft/skills/msm_wrapper.py
++++ b/mycroft/skills/msm_wrapper.py
+@@ -22,6 +22,7 @@ frequently.  To improve performance, the MSM instance is cached.
+ from collections import namedtuple
+ from functools import lru_cache
+ from os import path, makedirs
++from xdg import BaseDirectory
+ 
+ from msm import MycroftSkillsManager, SkillRepo
+ 
+@@ -33,9 +34,8 @@ MsmConfig = namedtuple(
+     [
+         'platform',
+         'repo_branch',
+-        'repo_cache',
+         'repo_url',
+-        'skills_dir',
++        'old_skills_dir',
+         'versioned'
+     ]
+ )
+@@ -70,9 +70,8 @@ def build_msm_config(device_config: dict) -> MsmConfig:
+     return MsmConfig(
+         platform=enclosure_config.get('platform', 'default'),
+         repo_branch=msm_repo_config['branch'],
+-        repo_cache=path.join(data_dir, msm_repo_config['cache']),
+         repo_url=msm_repo_config['url'],
+-        skills_dir=path.join(data_dir, msm_config['directory']),
++        old_skills_dir=path.join(data_dir, msm_config['directory']),
+         versioned=msm_config['versioned']
+     )
+ 
+@@ -94,17 +93,15 @@ def create_msm(msm_config: MsmConfig) -> MycroftSkillsManager:
+     msm_lock = _init_msm_lock()
+     LOG.info('Acquiring lock to instantiate MSM')
+     with msm_lock:
+-        if not path.exists(msm_config.skills_dir):
+-            makedirs(msm_config.skills_dir)
++        BaseDirectory.save_data_path('mycroft/skills')
+ 
+         msm_skill_repo = SkillRepo(
+-            msm_config.repo_cache,
+             msm_config.repo_url,
+             msm_config.repo_branch
+         )
+         msm_instance = MycroftSkillsManager(
+             platform=msm_config.platform,
+-            skills_dir=msm_config.skills_dir,
++            old_skills_dir=msm_config.old_skills_dir,
+             repo=msm_skill_repo,
+             versioned=msm_config.versioned
+         )
+diff --git a/mycroft/skills/mycroft_skill/mycroft_skill.py b/mycroft/skills/mycroft_skill/mycroft_skill.py
+index 99f16c99c4..76675ed32b 100644
+--- a/mycroft/skills/mycroft_skill/mycroft_skill.py
++++ b/mycroft/skills/mycroft_skill/mycroft_skill.py
+@@ -124,7 +124,7 @@ class MycroftSkill:
+ 
+         # Get directory of skill
+         #: Member variable containing the absolute path of the skill's root
+-        #: directory. E.g. /opt/mycroft/skills/my-skill.me/
++        #: directory. E.g. $XDG_DATA_HOME/mycroft/skills/my-skill.me/
+         self.root_dir = dirname(abspath(sys.modules[self.__module__].__file__))
+ 
+         self.gui = SkillGUI(self)
+diff --git a/mycroft/skills/settings.py b/mycroft/skills/settings.py
+index c48416afac..6e70783df0 100644
+--- a/mycroft/skills/settings.py
++++ b/mycroft/skills/settings.py
+@@ -99,7 +99,7 @@ def save_settings(skill_dir, skill_settings):
+     """Save skill settings to file."""
+     settings_path = Path(skill_dir).joinpath('settings.json')
+ 
+-    # Either the file already exists in /opt, or we are writing
++    # Either the file already exists or we are writing
+     # to XDG_CONFIG_DIR and always have the permission to make
+     # sure the file always exists
+     if not Path(settings_path).exists():
+diff --git a/mycroft/skills/skill_manager.py b/mycroft/skills/skill_manager.py
+index f6d84c74d2..8d2b415efb 100644
+--- a/mycroft/skills/skill_manager.py
++++ b/mycroft/skills/skill_manager.py
+@@ -18,6 +18,8 @@ from glob import glob
+ from threading import Thread, Event, Lock
+ from time import sleep, time, monotonic
+ from inspect import signature
++import shutil
++from xdg import BaseDirectory
+ 
+ from mycroft.api import is_paired
+ from mycroft.enclosure.api import EnclosureAPI
+@@ -263,7 +265,9 @@ class SkillManager(Thread):
+ 
+     def _remove_git_locks(self):
+         """If git gets killed from an abrupt shutdown it leaves lock files."""
+-        for i in glob(os.path.join(self.msm.skills_dir, '*/.git/index.lock')):
++        for i in glob(os.path.join(
++            BaseDirectory.save_data_path('mycroft/skills'),
++                '*/.git/index.lock')):
+             LOG.warning('Found and removed git lock file: ' + i)
+             os.remove(i)
+ 
+@@ -309,7 +313,8 @@ class SkillManager(Thread):
+         return skill_loader if load_status else None
+ 
+     def _get_skill_directories(self):
+-        skill_glob = glob(os.path.join(self.msm.skills_dir, '*/'))
++        skill_glob = glob(os.path.join(
++            BaseDirectory.save_data_path('mycroft/skills'), '*/'))
+ 
+         skill_directories = []
+         for skill_dir in skill_glob:
+diff --git a/mycroft/skills/skill_updater.py b/mycroft/skills/skill_updater.py
+index ace247e2db..3e7cc9e0b7 100644
+--- a/mycroft/skills/skill_updater.py
++++ b/mycroft/skills/skill_updater.py
+@@ -17,6 +17,7 @@ import os
+ import sys
+ from datetime import datetime
+ from time import time
++from xdg import BaseDirectory
+ 
+ from msm import MsmException
+ 
+@@ -53,7 +54,8 @@ class SkillUpdater:
+         self.config = Configuration.get()
+         update_interval = self.config['skills']['update_interval']
+         self.update_interval = int(update_interval) * ONE_HOUR
+-        self.dot_msm_path = os.path.join(self.msm.skills_dir, '.msm')
++        self.dot_msm_path = os.path.join(
++                BaseDirectory.save_data_path('mycroft/skills'), '.msm')
+         self.next_download = self._determine_next_download_time()
+         self._log_next_download_time()
+         self.installed_skills = set()
+diff --git a/pytest.ini b/pytest.ini
+index 6634fabcb0..92780db4d4 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,3 +1,5 @@
+ [pytest]
+ testpaths = test
+ norecursedirs = wake_word
++env =
++    XDG_DATA_HOME=/tmp/mycroft-test
+diff --git a/requirements/requirements.txt b/requirements/requirements.txt
+index dc5c5071cb..4e73baf9ba 100644
+--- a/requirements/requirements.txt
++++ b/requirements/requirements.txt
+@@ -16,7 +16,7 @@ fasteners==0.14.1
+ PyYAML==5.4
+ 
+ lingua-franca==0.2.2
+-msm==0.8.8
++msm==0.9.0
+ msk==0.3.16
+ mycroft-messagebus-client==0.9.1
+ adapt-parser==0.3.7
+diff --git a/requirements/tests.txt b/requirements/tests.txt
+index 9e038123e5..3d2e2b9a4c 100644
+--- a/requirements/tests.txt
++++ b/requirements/tests.txt
+@@ -2,6 +2,7 @@ coveralls==1.8.2
+ flake8==3.7.9
+ pytest==5.2.4
+ pytest-cov==2.8.1
++pytest-env==0.6.2
+ cov-core==1.15.0
+ sphinx==2.2.1
+ sphinx-rtd-theme==0.4.3
+diff --git a/test/unittests/base.py b/test/unittests/base.py
+index fed9394176..ee86778fa1 100644
+--- a/test/unittests/base.py
++++ b/test/unittests/base.py
+@@ -18,6 +18,8 @@ from shutil import rmtree
+ from unittest import TestCase
+ from unittest.mock import patch
+ 
++from xdg import BaseDirectory
++
+ from .mocks import mock_msm, mock_config, MessageBusMock
+ 
+ 
+@@ -54,3 +56,4 @@ class MycroftUnitTestBase(TestCase):
+ 
+     def tearDown(self):
+         rmtree(str(self.temp_dir))
++        rmtree(BaseDirectory.save_data_path('mycroft'))
+diff --git a/test/unittests/skills/test_skill_manager.py b/test/unittests/skills/test_skill_manager.py
+index dfd92718f4..cc6130362e 100644
+--- a/test/unittests/skills/test_skill_manager.py
++++ b/test/unittests/skills/test_skill_manager.py
+@@ -13,6 +13,8 @@
+ # limitations under the License.
+ #
+ from os import path
++from pathlib import Path
++from xdg import BaseDirectory
+ from unittest import TestCase
+ from unittest.mock import Mock, patch
+ 
+@@ -90,7 +92,8 @@ class TestSkillManager(MycroftUnitTestBase):
+         self.skill_updater_mock = skill_updater_patch.start()
+ 
+     def _mock_skill_loader_instance(self):
+-        self.skill_dir = self.temp_dir.joinpath('test_skill')
++        self.skill_dir = (Path(BaseDirectory.save_data_path('mycroft/skills'))
++                          .joinpath('test_skill'))
+         self.skill_loader_mock = Mock(spec=SkillLoader)
+         self.skill_loader_mock.instance = Mock()
+         self.skill_loader_mock.instance.default_shutdown = Mock()
+@@ -123,8 +126,7 @@ class TestSkillManager(MycroftUnitTestBase):
+         )
+ 
+     def test_remove_git_locks(self):
+-        git_dir = self.temp_dir.joinpath('foo/.git')
+-        git_dir.mkdir(parents=True)
++        git_dir = Path(BaseDirectory.save_data_path('mycroft/skills/foo/.git'))
+         git_lock_file_path = str(git_dir.joinpath('index.lock'))
+         with open(git_lock_file_path, 'w') as git_lock_file:
+             git_lock_file.write('foo')
+-- 
+2.20.1
+

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

@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pako/json
 md5	8eb7077075091c50e4b8a9f939607277  pako-0.2.3.tar.gz
-sha256	6be55fd8c5a2a6f02974f37438c1c47a3d9e764ce81c9d0a1a8c9a1815a59778  pako-0.2.3.tar.gz
+sha256	c033a073bb818ca336ae1fccba2655bd60dfe77744f85d4517abd3160d72231f  pako-0.3.1.tar.gz
 # Locally computed sha256 checksums
 sha256	a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9  LICENSE

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

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PAKO_VERSION = 0.2.3
+PYTHON_PAKO_VERSION = 0.3.1
 PYTHON_PAKO_SOURCE = pako-$(PYTHON_PAKO_VERSION).tar.gz
-PYTHON_PAKO_SITE = https://files.pythonhosted.org/packages/96/91/bf16a2f64a6628dfbfd9218f0331fbf73655530608ddd2f8fb597fdb9458
+PYTHON_PAKO_SITE = https://files.pythonhosted.org/packages/0d/27/0c491946572618f32c174101facca4dfb7034317e045c1e3950ed4fee689
 PYTHON_PAKO_SETUP_TYPE = setuptools
 PYTHON_PAKO_LICENSE = Apache-2.0
 PYTHON_PAKO_LICENSE_FILES = LICENSE

buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf

@@ -2,6 +2,7 @@
   "play_wav_cmdline": "paplay %1",
   "play_mp3_cmdline": "mpg123 %1",
   "ipc_path": "/ramdisk/mycroft/ipc/",
+  "data_dir": "/home/mycroft/.local/mycroft",
   "enclosure": {
     "platform": "OpenVoiceOS",
     "platform_build": 1
@@ -33,7 +34,7 @@
     "mimic2": {
       "lang": "en-us",
       "url": "https://mimic-api.mycroft.ai/synthesize?text=",
-      "preloaded_cache": "/opt/mycroft/preloaded_cache/Mimic2"
+      "preloaded_cache": "/home/mycroft/.cache/mycroft/preloaded_cache/Mimic2"
     },
     "pulse_duck": true
   },

buildroot-patches/0114-Little-hack-to-chown-opt-mycroft-to-the-user-mycroft.patch

@@ -1,26 +0,0 @@
-From d34e00b823d88e2883cefe6409f39706b7fcda97 Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Thu, 28 Jan 2021 12:44:07 +0100
-Subject: [PATCH 1/1] Little hack to chown /opt/mycroft to the user mycroft
-
----
- support/scripts/mkusers | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/support/scripts/mkusers b/support/scripts/mkusers
-index d00ba33823..2332afcb2c 100755
---- a/support/scripts/mkusers
-+++ b/support/scripts/mkusers
-@@ -362,6 +362,9 @@ add_one_user() {
-     if [ "${home}" != "-" ]; then
-         mkdir -p "${TARGET_DIR}/${home}"
-         printf "chown -h -R %d:%d '%s'\n" "${uid}" "${_gid}" "${TARGET_DIR}/${home}"
-+	if [ "${username}" = "mycroft" ]; then
-+	    printf "chown -h -R %d:%d '%s'\n" "${uid}" "${_gid}" "${TARGET_DIR}//opt/mycroft"
-+	fi
-     fi
- }
- 
--- 
-2.20.1
-