Commit 0b33ec33 authored by Gaël Écorchard's avatar Gaël Écorchard
Browse files

Split MKR workspace away from robolab workspace

parent f2a0174b
......@@ -7,6 +7,7 @@ git
gitk
git-gui
mc
mosh
nano
net-tools
nmap
......
......@@ -3,7 +3,7 @@
uri: https://gitlab.fel.cvut.cz/robolab/robolab.git
version: master
- git:
local-name: turtlebot
local-name: robolab_turtlebot
uri: https://gitlab.ciirc.cvut.cz/rop/teaching/turtlebot.git
version: master
- git:
......
......@@ -26,3 +26,15 @@
local-name: turtlebot_simulator
uri: https://github.com/turtlebot/turtlebot_simulator.git
version: melodic
- git:
local-name: flatland
uri: https://github.com/avidbots/flatland.git
version: master
- git:
local-name: turtlebot_flatland
uri: https://github.com/avidbots/turtlebot_flatland.git
version: master
- git:
local-name: stdr_simulator
uri: https://github.com/stdr-simulator-ros-pkg/stdr_simulator.git
version: indigo-devel
- git:
local-name: ros_packages
uri: https://gitlab.ciirc.cvut.cz/imr/mkr/ros_packages.git
version: master
......@@ -63,7 +63,7 @@ echo "Extended workspace: ${extend}"
# Workspace rosinstall files
if [ ! "${rosinstall}" ]; then
rosinstall="${dir}/../rosinstall/robolab.rosinstall ${dir}/../rosinstall/robolab_${ros}.rosinstall"
rosinstall="${dir}/../config/robolab.rosinstall ${dir}/../config/robolab_${ros}.rosinstall"
fi
if [ ! "${rosinstall}" ]; then
echo 'ERROR: Workspace configuration rosinstall files not specified.'
......
......@@ -8,7 +8,7 @@ cd "${dir}"
files="
robolab_melodic
"
for f in robolab_melodic; do
for f in $files; do
sudo rm -f "${f}.simg"
sudo singularity build "${f}.simg" "${f}.txt" 2>&1 | tee "${f}.log" \
&& sudo chown ${USER}:${USER} "${f}.simg"
......
......@@ -39,4 +39,11 @@ From: ros:melodic-robot
install=/opt/ros/aro \
scripts/setup_catkin_workspace "$(mktemp -d)"
extend=/opt/ros/robolab \
ros=melodic \
rosdep=y \
rosinstall=$(pwd)/config/robolab_mkr_melodic.rosinstall \
install=/opt/ros/mkr \
scripts/setup_catkin_workspace "$(mktemp -d)"
apt-get clean
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment