builder: Disable ld.so preloaded error

builder/image-build.sh

@@ -113,9 +113,6 @@ losetup -d ${DEV_IMAGE}
 # Install software
 img-chroot ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-software.sh'
 
-# Configure image
-img-chroot ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-configure.sh'
-
 # Copy service files for clever show client and visual_pose_watchdog
 img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever-show.service' '/lib/systemd/system/'
 img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/failsafe.service' '/lib/systemd/system/'
@@ -126,6 +123,9 @@ img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/client-setup' '/usr/local/b
 # Copy chrony configuration
 img-chroot ${IMAGE_PATH} copy ${REPO_DIR}'/examples/chrony/client.conf' '/etc/chrony/chrony.conf'
 
+# Configure image
+img-chroot ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-configure.sh'
+
 # 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

builder/image-configure.sh

@@ -39,3 +39,6 @@ Defaults        env_keep += "ROS_LOG_DIR"
 EOT
 
 echo_stamp "Image was configured!" "SUCCESS"
+
+echo "Move /etc/ld.so.preload back to its original position"
+mv /etc/ld.so.preload.disabled-for-build /etc/ld.so.preload

builder/image-software.sh

@@ -49,6 +49,9 @@ my_travis_retry() {
   return $result
 }
 
+echo_stamp "Move /etc/ld.so.preload out of the way"
+mv /etc/ld.so.preload /etc/ld.so.preload.disabled-for-build
+
 echo_stamp "Update apt cache"
 apt-get update -qq