aboutsummaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-02-01 12:55:15 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-02-01 12:55:15 +0100
commit33a32fca142b33e8058ad579c73dfd7cf6b8e030 (patch)
tree988a677cff700205f3f91b23b2e8b807f5c307c1 /Tools
parent2979d146422908e108cecfe37094c191521810ed (diff)
downloadpx4-firmware-33a32fca142b33e8058ad579c73dfd7cf6b8e030.tar.gz
px4-firmware-33a32fca142b33e8058ad579c73dfd7cf6b8e030.tar.bz2
px4-firmware-33a32fca142b33e8058ad579c73dfd7cf6b8e030.zip
Tools/ros: add license info
Diffstat (limited to 'Tools')
-rw-r--r--Tools/ros/docker/px4-ros-full/Dockerfile1
-rw-r--r--Tools/ros/docker/px4-ros-full/README.md2
-rw-r--r--Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh2
-rwxr-xr-xTools/ros/px4_ros_installation_ubuntu.sh1
-rwxr-xr-xTools/ros/px4_workspace_create.sh1
-rwxr-xr-xTools/ros/px4_workspace_setup.sh2
-rw-r--r--Tools/ros/vagrant/docker-host-base/Vagrantfile4
-rw-r--r--Tools/ros/vagrant/docker-host-base/config/docker-default3
-rw-r--r--Tools/ros/vagrant/docker-host-base/config/xsessionrc1
-rw-r--r--Tools/ros/vagrant/docker-host/Vagrantfile2
-rw-r--r--Tools/ros/vagrant/px4-ros/Vagrantfile1
11 files changed, 19 insertions, 1 deletions
diff --git a/Tools/ros/docker/px4-ros-full/Dockerfile b/Tools/ros/docker/px4-ros-full/Dockerfile
index 9c0fbc688..1242b56b5 100644
--- a/Tools/ros/docker/px4-ros-full/Dockerfile
+++ b/Tools/ros/docker/px4-ros-full/Dockerfile
@@ -1,6 +1,7 @@
#
# PX4 full ROS container
#
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
FROM ubuntu:14.04.1
MAINTAINER Andreas Antener <andreas@uaventure.com>
diff --git a/Tools/ros/docker/px4-ros-full/README.md b/Tools/ros/docker/px4-ros-full/README.md
index 7d75754d9..af5170c70 100644
--- a/Tools/ros/docker/px4-ros-full/README.md
+++ b/Tools/ros/docker/px4-ros-full/README.md
@@ -2,6 +2,8 @@
Full desktop ROS container.
+License: according to LICENSE.md in the root directory of the PX4 Firmware repository
+
**TODO:**
- use https://github.com/phusion/baseimage-docker as base
diff --git a/Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh b/Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh
index 231166e27..2de5f8bec 100644
--- a/Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh
+++ b/Tools/ros/docker/px4-ros-full/scripts/setup-workspace.sh
@@ -3,6 +3,8 @@
# Create workspace at current location and fetch source repositories
#
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
+
WDIR=`pwd`
WORKSPACE=$WDIR/catkin_ws
diff --git a/Tools/ros/px4_ros_installation_ubuntu.sh b/Tools/ros/px4_ros_installation_ubuntu.sh
index 3b8b29381..7efc400cd 100755
--- a/Tools/ros/px4_ros_installation_ubuntu.sh
+++ b/Tools/ros/px4_ros_installation_ubuntu.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
# main ROS Setup
# following http://wiki.ros.org/indigo/Installation/Ubuntu
diff --git a/Tools/ros/px4_workspace_create.sh b/Tools/ros/px4_workspace_create.sh
index 4055f7320..cf80bcf8d 100755
--- a/Tools/ros/px4_workspace_create.sh
+++ b/Tools/ros/px4_workspace_create.sh
@@ -1,5 +1,6 @@
#!/bin/sh
# this script creates a catkin_ws in the current folder
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
mkdir -p catkin_ws/src
cd catkin_ws/src
diff --git a/Tools/ros/px4_workspace_setup.sh b/Tools/ros/px4_workspace_setup.sh
index 1675e54f3..53568b4fb 100755
--- a/Tools/ros/px4_workspace_setup.sh
+++ b/Tools/ros/px4_workspace_setup.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
+
# run this script from the root of your catkin_ws
source devel/setup.bash
cd src
diff --git a/Tools/ros/vagrant/docker-host-base/Vagrantfile b/Tools/ros/vagrant/docker-host-base/Vagrantfile
index bc9329bf8..06e4e897d 100644
--- a/Tools/ros/vagrant/docker-host-base/Vagrantfile
+++ b/Tools/ros/vagrant/docker-host-base/Vagrantfile
@@ -9,6 +9,8 @@
# After build, do "vagrant package --base docker-host-base" to package,
# and import as box: "vagrant box add --name uaventure/docker-host-base package.box"
#
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
+
Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/trusty64"
@@ -19,7 +21,7 @@ Vagrant.configure(2) do |config|
vb.gui = true
vb.memory = "1024"
end
-
+
config.vm.provision "file", source: "config/docker-default", destination: "/home/vagrant/docker-default"
config.vm.provision "file", source: "config/xsessionrc", destination: "/home/vagrant/.xsessionrc"
diff --git a/Tools/ros/vagrant/docker-host-base/config/docker-default b/Tools/ros/vagrant/docker-host-base/config/docker-default
index e8a86ce6a..19c466b6b 100644
--- a/Tools/ros/vagrant/docker-host-base/config/docker-default
+++ b/Tools/ros/vagrant/docker-host-base/config/docker-default
@@ -23,4 +23,7 @@
#export TMPDIR="/mnt/bigdrive/docker-tmp"
# Expose TCP port in addition to socket
+
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
+
DOCKER_OPTS="${DOCKER_OPTS} -H unix:///var/run/docker.sock -H 0.0.0.0:2375"
diff --git a/Tools/ros/vagrant/docker-host-base/config/xsessionrc b/Tools/ros/vagrant/docker-host-base/config/xsessionrc
index d8ab6d53d..1bd4f8d3f 100644
--- a/Tools/ros/vagrant/docker-host-base/config/xsessionrc
+++ b/Tools/ros/vagrant/docker-host-base/config/xsessionrc
@@ -2,4 +2,5 @@
#
# Disable X access control so we can easily start GUI apps
#
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
xhost +
diff --git a/Tools/ros/vagrant/docker-host/Vagrantfile b/Tools/ros/vagrant/docker-host/Vagrantfile
index 4ae94258d..2a0a02271 100644
--- a/Tools/ros/vagrant/docker-host/Vagrantfile
+++ b/Tools/ros/vagrant/docker-host/Vagrantfile
@@ -12,6 +12,8 @@
# You can then load an existing image, e.g.:
# "docker load -i container-image.tar"
#
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
+
Vagrant.configure(2) do |config|
config.vm.box = "uaventure/docker-host-base"
diff --git a/Tools/ros/vagrant/px4-ros/Vagrantfile b/Tools/ros/vagrant/px4-ros/Vagrantfile
index a122fb4a3..5b372a94d 100644
--- a/Tools/ros/vagrant/px4-ros/Vagrantfile
+++ b/Tools/ros/vagrant/px4-ros/Vagrantfile
@@ -23,6 +23,7 @@
# - do not run the docker container with "--rm" (vagrant default). is that even possible?
# - maybe map a local working directory to compile stuff without loosing it in side the docker container
#
+# License: according to LICENSE.md in the root directory of the PX4 Firmware repository
Vagrant.configure(2) do |config|
# Configure docker host