From da9eb7d0ba59ead2ec3f658a1b19293aba21d142 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Mon, 24 Sep 2018 17:57:05 +0300 Subject: [PATCH] image_builder: disable debug comments --- builder_scripts/builder.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/builder_scripts/builder.sh b/builder_scripts/builder.sh index c806425f..a1c1063d 100755 --- a/builder_scripts/builder.sh +++ b/builder_scripts/builder.sh @@ -11,24 +11,24 @@ set -e cd ${IMAGE_BUILDER} # Make free space -# ./image-resize.sh ${IMAGE_PATH} max '7G' +./image-resize.sh ${IMAGE_PATH} max '7G' -# ./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/init_rpi.sh' '/root/' -# ./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/hardware_setup.sh' '/root/' +./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/init_rpi.sh' '/root/' +./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/hardware_setup.sh' '/root/' -# ./image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/init_image.sh' ${CLEVER_VERSION} $(jq '.source_image' -r ${TARGET_CONFIG}) -# ./image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/software_install.sh' -# ./image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/network_setup.sh' +./image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/init_image.sh' ${CLEVER_VERSION} $(jq '.source_image' -r ${TARGET_CONFIG}) +./image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/software_install.sh' +./image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/network_setup.sh' -# # If RPi then use a one thread to build a ROS package on RPi, else use all -# [[ $(arch) == 'armv7l' ]] && NUMBER_THREADS=1 || NUMBER_THREADS=$(nproc --all) +# If RPi then use a one thread to build a ROS package on RPi, else use all +[[ $(arch) == 'armv7l' ]] && NUMBER_THREADS=1 || NUMBER_THREADS=$(nproc --all) -# ./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever.service' '/root/' -# ./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/roscore.env' '/root/' -# ./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/roscore.service' '/root/' +./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever.service' '/root/' +./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/roscore.env' '/root/' +./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/roscore.service' '/root/' -# ./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-rosdep-clever.yaml' '/etc/ros/rosdep/' -# # ./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-ros-clever.rosinstall' '/home/pi/ros_catkin_ws/' -# ./image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/ros_install.sh' ${TARGET_REPO} ${TARGET_REF} False False ${NUMBER_THREADS} +./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-rosdep-clever.yaml' '/etc/ros/rosdep/' +# ./image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-ros-clever.rosinstall' '/home/pi/ros_catkin_ws/' +./image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/ros_install.sh' ${TARGET_REPO} ${TARGET_REF} False False ${NUMBER_THREADS} -# ./image-resize.sh ${IMAGE_PATH} +./image-resize.sh ${IMAGE_PATH}