From 3eb157a4fa4324a35355c60447ce3e76b4850918 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Mon, 4 Jan 2021 20:57:46 +0100
Subject: [PATCH] Change to own pairing skill and make sure MSM doesn't hang on
 very first boot. Mycroft doesn't continue if the repo skill doesn't get
 fetched which obviously can't be fetch without network. So include a local
 copy of the skills-repo so at least it doesn't stall the boot.

---
 .gitmodules                                            | 10 ++++++++++
 buildroot-external/board/raspberrypi4-64/post-build.sh |  6 ++++++
 .../rootfs-overlay/etc/mycroft/mycroft.conf            |  3 ++-
 .../rootfs-overlay/etc/tmpfiles.d/mycroft.conf         |  5 +----
 .../rootfs-overlay/opt/mycroft/.skills-repo            |  1 +
 .../opt/mycroft/skills/skill-ovos-pairing              |  1 +
 6 files changed, 21 insertions(+), 5 deletions(-)
 create mode 160000 buildroot-external/rootfs-overlay/opt/mycroft/.skills-repo
 create mode 160000 buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing

diff --git a/.gitmodules b/.gitmodules
index f3cb0f0a..40bf1db4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,3 +17,13 @@
         path = buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-balena-wifi-setup
         url = https://github.com/OpenVoiceOS/skill-balena-wifi-setup.git
         branch = master
+
+[submodule "skill-ovos-pairing"]
+        path = buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing
+        url = https://github.com/OpenVoiceOS/skill-ovos-pairing.git
+        branch = master
+
+[submodule "mycroft-skills"]
+        path = buildroot-external/rootfs-overlay/opt/mycroft/.skills-repo
+        url = https://github.com/MycroftAI/mycroft-skills.git
+        branch = 20.08
diff --git a/buildroot-external/board/raspberrypi4-64/post-build.sh b/buildroot-external/board/raspberrypi4-64/post-build.sh
index 61fa7ad9..b68908bf 100755
--- a/buildroot-external/board/raspberrypi4-64/post-build.sh
+++ b/buildroot-external/board/raspberrypi4-64/post-build.sh
@@ -31,3 +31,9 @@ BOARD_DIR="$(dirname $0)"
 
 cp -f ../buildroot-external/board/raspberrypi/config.txt ${BINARIES_DIR}/rpi-firmware/config.txt
 cp -f ../buildroot-external/board/raspberrypi/cmdline.txt ${BINARIES_DIR}/rpi-firmware/cmdline.txt
+
+cp -fr ../buildroot-external/rootfs-overlay/opt/mycroft/.skills-repo/.git* ${TARGET_DIR}/opt/mycroft/.skills-repo/
+cp -fr ../buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-balena-wifi-setup/.git* ${TARGET_DIR}/opt/mycroft/skills/skill-balena-wifi-setup/
+cp -fr ../buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-enclosure/.git* ${TARGET_DIR}/opt/mycroft/skills/skill-ovos-enclosure/
+cp -fr ../buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-mycroftgui/.git* ${TARGET_DIR}/opt/mycroft/skills/skill-ovos-mycroftgui/
+cp -fr ../buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing/.git* ${TARGET_DIR}/opt/mycroft/skills/skill-ovos-pairing/
diff --git a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf
index 3b72d03a..687298c6 100644
--- a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf
+++ b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf
@@ -20,7 +20,8 @@
     "pulse_duck": true
   },
   "skills": {
-    "priority_skills": ["skill-ovos-enclosure", "skill-ovos-mycroftgui", "skill-balena-wifi-setup", "mycroft-pairing"]
+    "blacklisted_skills": ["mycroft-pairing.mycroftai"],
+    "priority_skills": ["skill-ovos-enclosure", "skill-ovos-mycroftgui", "skill-balena-wifi-setup", "skill-ovos-pairing"]
   },
   "log_level": "INFO"
 }
diff --git a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf
index 15a674ea..b7a9c527 100644
--- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf
+++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf
@@ -1,5 +1,2 @@
 d /var/log/mycroft 700 mycroft mycroft
-z /opt/mycroft 755 mycroft mycroft
-Z /opt/mycroft/skills 755 mycroft mycroft
-Z /opt/mycroft/splash 755 mycroft mycroft
-Z /opt/mpd 755 mycroft mycroft
+Z /opt/mycroft 755 mycroft mycroft
diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/.skills-repo b/buildroot-external/rootfs-overlay/opt/mycroft/.skills-repo
new file mode 160000
index 00000000..c803a3dc
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/opt/mycroft/.skills-repo
@@ -0,0 +1 @@
+Subproject commit c803a3dcaaf69247fbcdc8b67d26bbce5f018936
diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing b/buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing
new file mode 160000
index 00000000..3d8c2d53
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/skill-ovos-pairing
@@ -0,0 +1 @@
+Subproject commit 3d8c2d535c50b0ab256e2abe836311801be91c7a