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

@@ -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

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/

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"
 }

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