Skip to content
Snippets Groups Projects
Commit a839b00a authored by Bob Mottram's avatar Bob Mottram
Browse files

Configurable filename for build log

parent bddc98a1
No related branches found
No related tags found
No related merge requests found
No preview for this file type
......@@ -77,6 +77,9 @@ PASSWORD=
CONTINUOUS_INTEGRATION=""
# filename where the build progress will be logged to
BUILD_LOG=
# IP address of the router (gateway)
ROUTER_IP_ADDRESS="192.168.1.254"
......@@ -331,6 +334,10 @@ do
shift
IMAGE_TYPE="$1"
;;
--build-log)
shift
BUILD_LOG="$1"
;;
-u|--user|--username)
shift
USERNAME="$1"
......@@ -639,7 +646,8 @@ make "$IMAGE_TYPE" \
SOCIALINSTANCE="$SOCIALINSTANCE" \
EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \
LOCAL_NAME="$LOCAL_NAME"
LOCAL_NAME="$LOCAL_NAME" \
BUILD_LOG="$BUILD_LOG"
# shellcheck disable=SC2181
if [ ! "$?" = "0" ]; then
......
......@@ -79,6 +79,7 @@ export SOCIALINSTANCE
export LOCAL_NAME
export EXTERNAL_DRIVE
export CONTINUOUS_INTEGRATION
export BUILD_LOG
# Locate vmdebootstrap program fetched in Makefile
basedir=`pwd`
......@@ -270,6 +271,9 @@ fi
sudo chmod +x $TEMP_CUSTOMISE
echo $'Customised customisation script created'
if [ ! "$BUILD_LOG" ]; then
BUILD_LOG="$(dirname "$IMAGE")/${PROJECT_NAME}.log"
fi
echo $"starting $VMDEBOOTSTRAP"
......@@ -287,7 +291,7 @@ sudo -H \
EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \
$VMDEBOOTSTRAP \
--log "$(dirname "$IMAGE")/${PROJECT_NAME}.log" \
--log "$BUILD_LOG" \
--log-level debug \
--size "$IMAGE_SIZE" \
--image "$IMAGE.img" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment