From ecf5e1f35941cf8c8c3dab795f3f502f5a68dd90 Mon Sep 17 00:00:00 2001
From: Buzz <davidbuzz@gmail.com>
Date: Tue, 1 Aug 2017 17:10:18 +1000
Subject: [PATCH] improve readme, and drop the need for a ssh key of any sort,
 as we use http repo URLs now.

---
 solo-builder/README.md  | 36 ++++--------------------------------
 solo-builder/builder.sh |  8 +++++++-
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/solo-builder/README.md b/solo-builder/README.md
index 9362bce..37d9e47 100644
--- a/solo-builder/README.md
+++ b/solo-builder/README.md
@@ -15,20 +15,8 @@ We will remove this warning from the repository when it is no longer required.
 
 Works in [vagrant](http://vagrantup.com), typically useful for local builds.
 First install this plugin:
-
 ```
 $ vagrant plugin install vagrant-guest_ansible
-```
-
-**NOTE:** Make sure you have a file `~/.ssh/github_token` with a Github 
-token for downloading files. This will be copied into your Vagrant image when
-provisioning.
-
-Add the SSH key you have connected to Github to your ssh-agent to be able to
-provision your VM. Then run `vagrant up`:
-
-```
-$ ssh-add ~/.ssh/id_rsa
 $ vagrant up
 ```
 
@@ -41,29 +29,13 @@ To fire off the builder:
 $ vagrant ssh -c /vagrant/builder.sh
 ```
 
-**NOTE:* If you are seeing `jq` failures, you will need to edit each of these files:
-
-```
-nano /solo-build/sources/meta-3dr/recipes-firmware/artoo/artoo-firmware_*.bb
-nano /solo-build/sources/meta-3dr/recipes-firmware/gimbal/gimbal-firmware_*.bb
-nano /solo-build/sources/meta-3dr/recipes-firmware/pixhawk/pixhawk-firmware_*.bb
-```
-
-And replace
-
-```
-    TOKEN=...
-```
-
-with
-
-```
-    TOKEN=$(cat ~/.ssh/github_token)
-```
 
 ## using docker
 
-Works in Docker and boot2docker. Copy `id_rsa` and `solo-builder.pem` to this directory (sorry). Then run
+DOCKER IS UNTESTED OUTSIDE 3DR , USE VAGRANT FOR NOW.
+ 
+Works in Docker and boot2docker. 
+Copy `id_rsa` and `solo-builder.pem` to this directory (sorry). Then run
 
 ```
 docker build -t 3drobotics/solo-builder .
diff --git a/solo-builder/builder.sh b/solo-builder/builder.sh
index 7f8537b..68c4b73 100755
--- a/solo-builder/builder.sh
+++ b/solo-builder/builder.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-cp /vagrant/github_token ~/.ssh/github_token
 
 cd /solo-build
 
@@ -22,6 +21,13 @@ EULA=1 source ./setup-environment build
 MACHINE=imx6solo-3dr-1080p bitbake 3dr-solo -k
 MACHINE=imx6solo-3dr-artoo bitbake 3dr-controller -k
 
+# other options/examples, how to build just one bit, such as the pixhawk firmware from OpenSolo/meta-3dr/recipes-firmware/pixhawk/pixhawk-firmware_1.3.1.bb :
+# assuming you've run the 'export MACHINE...' and 'source ./setup...' commands first, and are in /solo-build/build/ folder as a result:
+#bitbake -c clean pixhawk-firmware
+#bitbake pixhawk-firmware
+#or verbose:
+#bitbake pixhawk-firmware -v
+
 # tip:
 echo look below for squashfs, uImage, kernel, u-boot, dtb file, initramfs, rootfs.cpio, etc 
 echo vagrant ssh