From 5b6d623e25e7d4f0b7251657ce6006fb6f63fddb Mon Sep 17 00:00:00 2001
From: Matt Lawrence <lawrence.matt@gmail.com>
Date: Sat, 5 Jan 2019 01:45:07 -0500
Subject: [PATCH] BUILD: Solo resources redirected to new consolidated local
 repo

Sololink, shotmanager, sololink-python, and stm32loader all now using the local consolidated repo.  No longer using the various individual repos.
---
 .../{shotmanager => sololink}/shotmanager.bb             | 9 ++++-----
 meta-3dr/recipes-sololink/sololink/sololink-python.bb    | 6 +++---
 meta-3dr/recipes-sololink/sololink/sololink.bb           | 6 +++---
 .../{stm32loader => sololink}/stm32loader.bb             | 6 +++---
 4 files changed, 13 insertions(+), 14 deletions(-)
 rename meta-3dr/recipes-sololink/{shotmanager => sololink}/shotmanager.bb (93%)
 rename meta-3dr/recipes-sololink/{stm32loader => sololink}/stm32loader.bb (57%)

diff --git a/meta-3dr/recipes-sololink/shotmanager/shotmanager.bb b/meta-3dr/recipes-sololink/sololink/shotmanager.bb
similarity index 93%
rename from meta-3dr/recipes-sololink/shotmanager/shotmanager.bb
rename to meta-3dr/recipes-sololink/sololink/shotmanager.bb
index d33a4f1..1016d54 100644
--- a/meta-3dr/recipes-sololink/shotmanager/shotmanager.bb
+++ b/meta-3dr/recipes-sololink/sololink/shotmanager.bb
@@ -2,13 +2,12 @@ SUMMARY = "shotmanager"
 HOMEPAGE = "https://github.com/OpenSolo/shotmanager"
 
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE-APACHE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+LIC_FILES_CHKSUM = "file:///vagrant/LICENSE-APACHE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "${AUTOREV}"
-SRC_URI = "git://github.com/OpenSolo/shotmanager"
-
+SRC_URI = "git:///vagrant/;protocol=file"
 PV = "${SRCPV}"
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/shotmanager"
 
 RDEPENDS_${PN} += "dronekit dronekit-solo"
 
@@ -18,7 +17,7 @@ FILES_${PN} += "${sysconfdir}/"
 
 do_compile () {
     echo "# auto-generated `date`" > shotManager_version.py
-    echo 'VERSION = "3.0.0"' >> shotManager_version.py
+    echo 'VERSION = "4-DEV"' >> shotManager_version.py
 }
 
 do_install () {
diff --git a/meta-3dr/recipes-sololink/sololink/sololink-python.bb b/meta-3dr/recipes-sololink/sololink/sololink-python.bb
index 75606c1..f62d3c9 100644
--- a/meta-3dr/recipes-sololink/sololink/sololink-python.bb
+++ b/meta-3dr/recipes-sololink/sololink/sololink-python.bb
@@ -2,12 +2,12 @@ SUMMARY = "sololink-python"
 HOMEPAGE = "https://github.com/OpenSolo/sololink-python"
 
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE-APACHE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+LIC_FILES_CHKSUM = "file:///vagrant/LICENSE-APACHE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "${AUTOREV}"
-SRC_URI = "git://github.com/OpenSolo/sololink-python/"
+SRC_URI = "git:///vagrant/;protocol=file"
 
 PV = "${SRCPV}"
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/sololink-python"
 
 inherit setuptools
diff --git a/meta-3dr/recipes-sololink/sololink/sololink.bb b/meta-3dr/recipes-sololink/sololink/sololink.bb
index b4ed2e2..01eefb6 100644
--- a/meta-3dr/recipes-sololink/sololink/sololink.bb
+++ b/meta-3dr/recipes-sololink/sololink/sololink.bb
@@ -1,13 +1,13 @@
 SUMMARY = "SoloLink software for RC, telemetry and video"
 
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE-APACHE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+LIC_FILES_CHKSUM = "file:///vagrant/LICENSE-APACHE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "${AUTOREV}"
-SRC_URI = "git://github.com/OpenSolo/SoloLink"
+SRC_URI = "git:///vagrant/;protocol=file"
 
 PV = "${SRCPV}"
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/sololink"
 
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
diff --git a/meta-3dr/recipes-sololink/stm32loader/stm32loader.bb b/meta-3dr/recipes-sololink/sololink/stm32loader.bb
similarity index 57%
rename from meta-3dr/recipes-sololink/stm32loader/stm32loader.bb
rename to meta-3dr/recipes-sololink/sololink/stm32loader.bb
index 1a9470e..94ffb5f 100644
--- a/meta-3dr/recipes-sololink/stm32loader/stm32loader.bb
+++ b/meta-3dr/recipes-sololink/sololink/stm32loader.bb
@@ -1,12 +1,12 @@
 SUMMARY = "stm32loader.py for bootloading the stm32"
 
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING3;md5=4fe869ee987a340198fb0d54c55c47f1"
+LIC_FILES_CHKSUM = "file:///vagrant/LICENSE-APACHE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "${AUTOREV}"
-SRC_URI = "git://github.com/OpenSolo/stm32loader/"
+SRC_URI = "git:///vagrant/;protocol=file"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/stm32loader"
 
 FILES_${PN} += "${bindir}/"