diff --git a/builder/image-build.sh b/builder/image-build.sh index 8f35ebd..c879a7f 100755 --- a/builder/image-build.sh +++ b/builder/image-build.sh @@ -123,6 +123,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} diff --git a/builder/image-software.sh b/builder/image-software.sh index 30684a4..b739550 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 @@ -76,6 +73,8 @@ catkin_make --pkg clever_flight_routines catkin_make aruco_pose 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"