From dc7b7532a566f40b6b99de8dcd031e4d14931a24 Mon Sep 17 00:00:00 2001 From: Buzz Date: Fri, 28 Jul 2017 17:07:57 +1000 Subject: [PATCH] Initial commit, based on .tar.gz file as provided by 3DR , see SOURCE file. --- solo-builder/.gitignore | 17 +++ solo-builder/COPYRIGHT-3DR | 21 ++++ solo-builder/Dockerfile | 36 ++++++ solo-builder/LICENSE-APACHE | 202 +++++++++++++++++++++++++++++++++ solo-builder/README.md | 104 +++++++++++++++++ solo-builder/SOURCE | 1 + solo-builder/Vagrantfile | 44 +++++++ solo-builder/WARNING.md | 11 ++ solo-builder/ansible.cfg | 5 + solo-builder/ansible.gitconfig | 3 + solo-builder/builder.sh | 20 ++++ solo-builder/playbook.retry | 1 + solo-builder/playbook.yml | 59 ++++++++++ solo-builder/repo/build.sh | 13 +++ solo-builder/repo/packages | 9 ++ 15 files changed, 546 insertions(+) create mode 100644 solo-builder/.gitignore create mode 100644 solo-builder/COPYRIGHT-3DR create mode 100644 solo-builder/Dockerfile create mode 100644 solo-builder/LICENSE-APACHE create mode 100644 solo-builder/README.md create mode 100644 solo-builder/SOURCE create mode 100644 solo-builder/Vagrantfile create mode 100644 solo-builder/WARNING.md create mode 100644 solo-builder/ansible.cfg create mode 100644 solo-builder/ansible.gitconfig create mode 100755 solo-builder/builder.sh create mode 100644 solo-builder/playbook.retry create mode 100644 solo-builder/playbook.yml create mode 100644 solo-builder/repo/build.sh create mode 100644 solo-builder/repo/packages diff --git a/solo-builder/.gitignore b/solo-builder/.gitignore new file mode 100644 index 0000000..842e611 --- /dev/null +++ b/solo-builder/.gitignore @@ -0,0 +1,17 @@ +ssh/ +# Elastic Beanstalk Files +.elasticbeanstalk/* +!.elasticbeanstalk/*.cfg.yml +!.elasticbeanstalk/*.global.yml +instance.json +inventory +id_rsa* +solo-builder.pem +staging/ + +.vagrant/ +vagrant_ansible_inventory_default + +accessorykit +packages/ +upload/ diff --git a/solo-builder/COPYRIGHT-3DR b/solo-builder/COPYRIGHT-3DR new file mode 100644 index 0000000..18b98ca --- /dev/null +++ b/solo-builder/COPYRIGHT-3DR @@ -0,0 +1,21 @@ +Copyright 2015-2016 3D Robotics + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use these files except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +~~~~ + +Contributors prior to public release: + + * Tim Ryan + * Liam Staskawicz + * Allan Matthew \ No newline at end of file diff --git a/solo-builder/Dockerfile b/solo-builder/Dockerfile new file mode 100644 index 0000000..2ec1500 --- /dev/null +++ b/solo-builder/Dockerfile @@ -0,0 +1,36 @@ +# Latest Ubuntu 14.04LTS + +FROM ubuntu:trusty + +RUN \ + apt-get update && \ + apt-get install --no-install-recommends -y software-properties-common && \ + apt-add-repository ppa:ansible/ansible && \ + apt-get update && \ + apt-get install -y ansible + +RUN echo '[local]\nlocalhost\n' > /etc/ansible/hosts + +RUN \ + adduser --disabled-password --gecos '' ubuntu && \ + adduser ubuntu sudo && \ + echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +COPY playbook.yml /provision/ +COPY ansible.cfg /provision/ +COPY ansible.gitconfig /provision/ +COPY builder.sh /provision/ +RUN chown -R ubuntu /provision/ + +COPY id_rsa /home/ubuntu/.ssh/ +COPY solo-builder.pem /home/ubuntu/.ssh/ +RUN chown -R ubuntu /home/ubuntu && chmod 0400 /home/ubuntu/.ssh/* + +RUN \ + su -l ubuntu -c "\ + export HOME=/home/ubuntu && \ + cd /provision && \ + eval \`ssh-agent\` && \ + ssh-add ~/.ssh/id_rsa && \ + ssh-add ~/.ssh/solo-builder.pem && \ + ansible-playbook -i "localhost," -c local playbook.yml" diff --git a/solo-builder/LICENSE-APACHE b/solo-builder/LICENSE-APACHE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/solo-builder/LICENSE-APACHE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/solo-builder/README.md b/solo-builder/README.md new file mode 100644 index 0000000..1640e6e --- /dev/null +++ b/solo-builder/README.md @@ -0,0 +1,104 @@ +WARNING - WORK IN PROGRESS + +``` +This code is known to be broken and/or incomplete. IT DOES NOT WORK. + +We are actively working on fixing it, and we really, really do not recommend you download it just yet. + +We will remove this warning from the repository when it is no longer required. +``` + + +# solo-builder + +## using vagrant + +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 +``` + +(If `vagrant up` fails, run `vagrant provision` to try provisioning your VM +again.) + +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 build -t 3drobotics/solo-builder . +``` + +Then run + +``` +docker run -i 3drobotics/solo-builder su -l ubuntu /solo-build/builder.sh +``` + +TODO: write a script that gets the files off after + +## using something else + +`playbook.yml` is an ansible file for an Ubuntu 14.04 distro. `builder.sh` is the build script for a user named `ubuntu`. Make it happen! + +## repos + +Private: + +* https://github.com/3drobotics/3dr-arm-yocto-bsp +* https://github.com/3drobotics/meta-3dr +* https://github.com/3drobotics/dronekit-python-solo +* https://github.com/3drobotics/imx6-uboot +* https://github.com/3drobotics/imx6-linux +* https://github.com/3drobotics/mavlink-solo +* https://github.com/3drobotics/sculpture_proprietary +* https://github.com/3drobotics/solo-gimbal +* https://github.com/3drobotics/artoo +* https://github.com/3drobotics/SoloLink + +Public: + +* https://github.com/3drobotics/MAVProxy +* https://github.com/3drobotics/stm32loader +* https://github.com/3drobotics/ardupilot-solo + diff --git a/solo-builder/SOURCE b/solo-builder/SOURCE new file mode 100644 index 0000000..cfc3ad9 --- /dev/null +++ b/solo-builder/SOURCE @@ -0,0 +1 @@ +This source code was released by 3DR in the file: solo-builder_5444ac08.tar.gz diff --git a/solo-builder/Vagrantfile b/solo-builder/Vagrantfile new file mode 100644 index 0000000..26f42e1 --- /dev/null +++ b/solo-builder/Vagrantfile @@ -0,0 +1,44 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + + config.vm.box = "ubuntu/trusty64" + config.vm.box_check_update = false + + # detect number of cores, + # http://stackoverflow.com/questions/891537/detect-number-of-cpus-installed + def self.processor_count + case RbConfig::CONFIG['host_os'] + when /darwin9/ + `hwprefs cpu_count`.to_i + when /darwin/ + ((`which hwprefs` != '') ? `hwprefs thread_count` : `sysctl -n hw.ncpu`).to_i + when /linux/ + `cat /proc/cpuinfo | grep processor | wc -l`.to_i + when /freebsd/ + `sysctl -n hw.ncpu`.to_i + when /mswin|mingw/ + require 'win32ole' + wmi = WIN32OLE.connect("winmgmts://") + cpu = wmi.ExecQuery("select NumberOfCores from Win32_Processor") # TODO count hyper-threaded in this + cpu.to_enum.first.NumberOfCores + end + end + + # fwd host ssh for git access + config.ssh.forward_agent = true + + config.vm.provider "virtualbox" do |vb| + # not recommended to use less than 6GB + vb.memory = "6144" + vb.cpus = processor_count + end + + config.vm.provision "guest_ansible" do |ansible| + ansible.extra_vars = { + build_dir_owner: "vagrant" + } + ansible.playbook = "playbook.yml" + end +end diff --git a/solo-builder/WARNING.md b/solo-builder/WARNING.md new file mode 100644 index 0000000..d84a9c0 --- /dev/null +++ b/solo-builder/WARNING.md @@ -0,0 +1,11 @@ +WARNING - WORK IN PROGRESS + +``` +This code is known to be broken and/or incomplete. IT DOES NOT WORK. + +We are actively working on fixing it, and we really, really do not recommend you download it just yet. + +We will remove this warning from the repository when it is no longer required. +``` + + diff --git a/solo-builder/ansible.cfg b/solo-builder/ansible.cfg new file mode 100644 index 0000000..126ef31 --- /dev/null +++ b/solo-builder/ansible.cfg @@ -0,0 +1,5 @@ +[ssh_connection] +pipelining = True + +[ssh_connection] +ssh_args = -o ForwardAgent=yes diff --git a/solo-builder/ansible.gitconfig b/solo-builder/ansible.gitconfig new file mode 100644 index 0000000..af45cfe --- /dev/null +++ b/solo-builder/ansible.gitconfig @@ -0,0 +1,3 @@ +[user] + name = Solo Builder + email = solo-builder@3drobotics.com diff --git a/solo-builder/builder.sh b/solo-builder/builder.sh new file mode 100755 index 0000000..8069659 --- /dev/null +++ b/solo-builder/builder.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +cd /solo-build + +if [ -z "$1" ]; then + BRANCH=sololink_v2.1.0-2 +else + BRANCH=$1 +fi + +echo "Initializing repo with branch $BRANCH" + +repo init -u git@github.com:3drobotics/3dr-arm-yocto-bsp.git -b $BRANCH +repo sync + +export MACHINE=imx6solo_3dr_1080p +EULA=1 source ./setup-environment build + +MACHINE=imx6solo_3dr_1080p bitbake 3dr-solo +MACHINE=imx6solo_3dr_artoo bitbake 3dr-controller diff --git a/solo-builder/playbook.retry b/solo-builder/playbook.retry new file mode 100644 index 0000000..4ad96d5 --- /dev/null +++ b/solo-builder/playbook.retry @@ -0,0 +1 @@ +default diff --git a/solo-builder/playbook.yml b/solo-builder/playbook.yml new file mode 100644 index 0000000..ab0e260 --- /dev/null +++ b/solo-builder/playbook.yml @@ -0,0 +1,59 @@ +- hosts: all + tasks: + - name: Installs packages + sudo: true + apt: pkg={{item}} state=installed update_cache=true cache_valid_time=86400 + with_items: + - gawk + - wget + - git-core + - diffstat + - unzip + - texinfo + - gcc-multilib + - build-essential + - chrpath + - socat + - libsdl1.2-dev + - xterm + - curl + + - name: Install jq + sudo: true + get_url: url=http://stedolan.github.io/jq/download/linux64/jq dest=/usr/local/bin/jq mode=0755 + + - name: Install repo + sudo: true + get_url: url=https://storage.googleapis.com/git-repo-downloads/repo dest=/usr/local/bin/repo mode=0755 + + - name: Git configuration + copy: src=ansible.gitconfig dest=~/.gitconfig + + - name: ensure github.com is a known host + lineinfile: + dest: ~/.ssh/known_hosts + create: yes + state: present + line: "{{ lookup('pipe', 'ssh-keyscan -t rsa github.com') }}" + regexp: "^github\\.com" + + - name: ensure bitbucket.org is a known host + lineinfile: + dest: ~/.ssh/known_hosts + create: yes + state: present + line: "{{ lookup('pipe', 'ssh-keyscan -t rsa bitbucket.org') }}" + regexp: "^bitbucket\\.org" + + - name: create build dir + sudo: true + # option to override build_dir_owner (currently used by vagrant) + file: path=/solo-build state=directory mode=0755 owner={{build_dir_owner | default('ubuntu')}} + + - name: repo init + shell: repo init -u git@github.com:3drobotics/3dr-arm-yocto-bsp.git -b sololink_v2.0.0-5 + args: + chdir: /solo-build + creates: /solo-build/build + + - copy: src=~/.ssh/github_token dest=~/.ssh/github_token mode=0455 diff --git a/solo-builder/repo/build.sh b/solo-builder/repo/build.sh new file mode 100644 index 0000000..039d8c9 --- /dev/null +++ b/solo-builder/repo/build.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +cd $(dirname $0) + +set -e +rm -rf static +mkdir -p static +while read -r p && [[ "$p" != '' ]]; do + cp ../build/tmp-eglibc/deploy/rpm/$p static/ +done