CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-05-28 16:09:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Arthur Golubtsov
2019-10-22 12:53:19 +03:00
parent 019a5587e5 0e9597dc26
commit c2b4016d38
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builder/image-build.sh
View File

@@ -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}

5
builder/image-software.sh
View File

@@ -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"