From dfc1272cb3463f140eddd9aae870cdb0dea39468 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 7 May 2018 15:09:59 +0100
Subject: [PATCH] Continuous integration build option
---
src/freedombone-image | 7 +++++++
src/freedombone-image-customise | 2 ++
src/freedombone-image-make | 2 ++
src/freedombone-image-makefile | 6 ++++--
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-image b/src/freedombone-image
index 18dad4a2c..cc42d3f87 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -74,6 +74,8 @@ IMAGE_NAME='full'
USERNAME="$USER"
PASSWORD=
+CONTINUOUS_INTEGRATION=
+
# IP address of the router (gateway)
ROUTER_IP_ADDRESS="192.168.1.254"
@@ -378,6 +380,10 @@ do
shift
INTERACTIVE="$1"
;;
+ --ci)
+ shift
+ CONTINUOUS_INTEGRATION="$1"
+ ;;
-g|--generic)
shift
GENERIC_IMAGE="$1"
@@ -614,6 +620,7 @@ make "$IMAGE_TYPE" \
AMNESIC="$AMNESIC" \
SOCIALINSTANCE="$SOCIALINSTANCE" \
EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
+ CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \
LOCAL_NAME="$LOCAL_NAME"
# shellcheck disable=SC2181
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 3cc75fc7f..4e87358ec 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -139,6 +139,8 @@ BMX6_COMMIT='39dd1f2d99ac5a3fa28e92f8173c15039132e181'
BMX7_REPO="https://github.com/bmx-routing/bmx7"
BMX7_COMMIT='0a82c7c10fef44b259b35e77ab33632aa132d219'
+CONTINUOUS_INTEGRATION=
+
PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
# Whether to use a SATA drive and if so what its device/partition name is
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index 0890fe183..8edee3081 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -78,6 +78,7 @@ export AMNESIC
export SOCIALINSTANCE
export LOCAL_NAME
export EXTERNAL_DRIVE
+export CONTINUOUS_INTEGRATION
# Locate vmdebootstrap program fetched in Makefile
basedir=`pwd`
@@ -228,6 +229,7 @@ sed -i "s|SOCIALINSTANCE=.*|SOCIALINSTANCE=\"${SOCIALINSTANCE}\"|g" "$TEMP_CUSTO
sed -i "s|LOCAL_NAME=.*|LOCAL_NAME=\"${LOCAL_NAME}\"|g" "$TEMP_CUSTOMISE3"
sed -i "s|EXTERNAL_DRIVE=.*|EXTERNAL_DRIVE=\"${EXTERNAL_DRIVE}\"|g" "$TEMP_CUSTOMISE3"
sed -i 's|#!/bin/bash||g' "$TEMP_CUSTOMISE3"
+sed -i "s|CONTINUOUS_INTEGRATION=.*|CONTINUOUS_INTEGRATION=${CONTINUOUS_INTEGRATION}|g" "$TEMP_CUSTOMISE3"
cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4
if [ -f $TEMP_CUSTOMISE ]; then
diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index 5b27f74b6..89b2f466f 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -41,8 +41,10 @@ IMAGE = $(NAME).img
ARCHIVE = $(IMAGE).xz
SIGNATURE = $(ARCHIVE).sig
OWNER = 1000
-XZ = xz --no-warn --verbose --keep --threads=0 -3
-SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
+if [ ! "$CONTINUOUS_INTEGRATION" ];
+ XZ = xz --no-warn --verbose --keep --threads=0 -3
+ SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
+fi
# settings for `make test`
TEST_SSH_PORT = 2222
--
GitLab