3 files changed, 6 insertions, 4 deletions

diff --git a/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service b/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service
index 07598235ee..4b4bcdd774 100644
--- a/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service
+++ b/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service
@@ -5,7 +5,8 @@ After=systemd-user-sessions.service
 
 [Service]
 Type=oneshot
-ExecStart=@LIBDIR@/mycroft/dev_setup.sh --allow-root
+ExecStart=cp -rf @LIBDIR@/mycroft /var/
+ExecStart=/var/mycroft/dev_setup.sh --allow-root
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service b/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service
index 28729f6b16..c7f477f136 100644
--- a/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service
+++ b/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service
@@ -5,10 +5,10 @@ After=mycroft-setup.service
 
 [Service]
 Type=forking
-WorkingDirectory=@LIBDIR@/mycroft
+WorkingDirectory=/var/mycroft
 ExecStartPre=mkdir -p /var/log/mycroft
-ExecStart=@LIBDIR@/mycroft/start-mycroft.sh all
-ExecStop=@LIBDIR@/mycroft/stop-mycroft.sh all
+ExecStart=/var/mycroft/start-mycroft.sh all
+ExecStop=/var/mycroft/stop-mycroft.sh all
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
index 54c06f5b6b..d4ac4096bc 100644
--- a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
+++ b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
@@ -24,6 +24,7 @@ inherit systemd
 
 # Mycroft installs itself on the host
 # Just copy the setup files to the rootfs
+# The mycroft-setup service will copy the files to /var/ where we run them from
 do_install() {
     install -d ${D}${libdir}/
     cp -r ${B} ${D}${libdir}/mycroft