From 521baaa652b1dd3a0473bffe54e785cb10c07d43 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 28 Sep 2018 18:58:22 +0300 Subject: [PATCH] image_builder: move mjpeg-streamer to ros-clever --- builder/assets/kinetic-rosdep-clever.yaml | 3 +++ builder/image-software.sh | 1 - clever/package.xml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/builder/assets/kinetic-rosdep-clever.yaml b/builder/assets/kinetic-rosdep-clever.yaml index 630e70b7..13dbc2e7 100644 --- a/builder/assets/kinetic-rosdep-clever.yaml +++ b/builder/assets/kinetic-rosdep-clever.yaml @@ -100,6 +100,9 @@ message_generation: message_runtime: debian: stretch: [ros-kinetic-message-runtime] +mjpg-streamer: + debian: + stretch: [mjpg-streamer=2.0] mk: debian: stretch: [ros-kinetic-mk] diff --git a/builder/image-software.sh b/builder/image-software.sh index 86e5e1b7..628d4512 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -77,7 +77,6 @@ python-rosinstall-generator=0.1.14-1 \ python-wstool=0.1.17-1 \ python-rosinstall=0.7.8-1 \ build-essential=12.3 \ -mjpg-streamer=2.0 \ > /dev/null \ && echo_stamp "Everything was installed!" "SUCCESS" \ || (echo_stamp "Some packages wasn't installed!" "ERROR"; exit 1) diff --git a/clever/package.xml b/clever/package.xml index c287f114..e479018d 100644 --- a/clever/package.xml +++ b/clever/package.xml @@ -24,6 +24,7 @@ nodelet mavros lxml + mjpg-streamer rosbridge_server