From 6813d49fd9aabe853c96627939054861272b8223 Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Tue, 22 Oct 2019 12:50:16 +0300 Subject: [PATCH 1/2] builder: Add camera_info copying from config folder --- builder/image-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/image-build.sh b/builder/image-build.sh index bb68595..aa802d2 100755 --- a/builder/image-build.sh +++ b/builder/image-build.sh @@ -122,6 +122,7 @@ img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever-show.service' '/lib/ # Copy config files for clever if [[ -d "${CONFIG_DIR}/launch" ]]; then img-chroot ${IMAGE_PATH} copy ${CONFIG_DIR}'/launch' '/home/pi/catkin_ws/src/clever/clever'; fi if [[ -d "${CONFIG_DIR}/map" ]]; then img-chroot ${IMAGE_PATH} copy ${CONFIG_DIR}'/map' '/home/pi/catkin_ws/src/clever/aruco_pose'; fi +if [[ -d "${CONFIG_DIR}/camera_info" ]]; then img-chroot ${IMAGE_PATH} copy ${CONFIG_DIR}'/camera_info' '/home/pi/catkin_ws/src/clever/clever'; fi # Shrink image img-resize ${IMAGE_PATH} From 0e9597dc266795980406739ec3814614a3b68213 Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Tue, 22 Oct 2019 12:50:47 +0300 Subject: [PATCH 2/2] builder: Make pi:pi as owner of catkin_ws dir --- builder/image-software.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builder/image-software.sh b/builder/image-software.sh index 6916c68..cc21aea 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -49,9 +49,6 @@ my_travis_retry() { return $result } -echo_stamp "Change repo owner to pi" -chown -Rf pi:pi /home/pi/clever-show/ - echo_stamp "Update apt cache" apt-get update -qq @@ -73,4 +70,8 @@ source devel/setup.bash catkin_make --pkg clever_flight_routines source devel/setup.bash +echo_stamp "Change clever-show and catkin_ws owner to pi" +chown -Rf pi:pi /home/pi/clever-show/ +chown -Rf pi:pi /home/pi/catkin_ws/ + echo_stamp "End of software installation"