[oe-commits] [meta-openembedded] 18/34: mycroft: Run the files from /var

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 8f1dd9940edfaf9ae3a1b6b81554e9ecb6636d44
Author: Alistair Francis <alistair.francis at wdc.com>
AuthorDate: Tue Oct 15 15:54:22 2019 -0700

    mycroft: Run the files from /var
    
    To avoid errors when running on a read only /lib/ file system copy the
    files to /var and run mycroft from there.
    
    Signed-off-by: Alistair Francis <alistair.francis at wdc.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../recipes-multimedia/mycroft/files/mycroft-setup.service          | 3 ++-
 meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service    | 6 +++---
 meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb        | 1 +
 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 0759823..4b4bcdd 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 28729f6..c7f477f 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 54c06f5..d4ac409 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.