build: change paths to build directories

Discussed with: @adschellevis

README.md

@@ -24,7 +24,9 @@ TL;DR
 
     # make dvd
 
-If successful, a dvd image can be found here: /tmp/images
+If successful, a dvd image can be found under:
+
+    # make print-IMAGESDIR
 
 Detailed build steps and options
 ================================
@@ -73,9 +75,13 @@ It can also be overrided by "/dev/null".
 How to run individual or composite build steps
 ----------------------------------------------
 
-Kernel, base, packages and release sets are stored under /tmp/sets
+Kernel, base, packages and release sets are stored under:
 
-All final images are stored under /tmp/images
+    # make print-SETSDIR
+
+All final images are stored under:
+
+    # make print-IMAGESDIR
 
 Build the userland binaries, bootloader and administrative files:
 
@@ -380,8 +386,12 @@ A fully contained nightly build for the system is invoked using:
 
     # make nightly
 
-Nightly builds are the only builds that write and archive logs under
-/tmp/logs and /tmp/logs/latest points to the last nightly build run.
+Nightly builds are the only builds that write and archive logs under:
+
+    # make print-LOGSDIR
+
+with ./latest pointing to the last nightly build run.  Older logs are
+archived and available for a number of runs for retrospective analysis.
 
 Last but not least, a refresh of OPNsense core and plugins on package
 sets is invoked using:

build/common.sh

@@ -204,9 +204,11 @@ export DEVICEDIR="${TOOLSDIR}/device"
 export PACKAGESDIR="/.pkg"
 
 # define and bootstrap target directories
-export IMAGESDIR="/tmp/images"
-export SETSDIR="/tmp/sets"
-export LOGSDIR="/tmp/logs"
+export TARGETDIRPREFIX="/usr/local/opnsense"
+export TARGETDIR="${TARGETDIRPREFIX}/build/${PRODUCT_SETTINGS}/${PRODUCT_ARCH}"
+export IMAGESDIR="${TARGETDIR}/images"
+export LOGSDIR="${TARGETDIR}/logs"
+export SETSDIR="${TARGETDIR}/sets"
 mkdir -p ${IMAGESDIR} ${SETSDIR} ${LOGSDIR}
 
 # automatically expanded product stuff

scripts/nightly.sh

@@ -2,8 +2,7 @@
 
 # nightly build script
 
-VERSION=$(date '+%Y%m%d%H%M')
-LOGSDIR="/tmp/logs"
+eval "$(make print-LOGSDIR,PRODUCT_VERSION)"
 
 for DIR in $(find ${LOGSDIR} -type d -depth 1); do
 	DIR=$(basename ${DIR})
@@ -13,12 +12,12 @@ done
 
 (make clean-obj 2>&1) > /dev/null
 
-mkdir -p ${LOGSDIR}/${VERSION}
-(cd ${LOGSDIR}; ln -sfn ${VERSION} latest)
+mkdir -p ${LOGSDIR}/${PRODUCT_VERSION}
+(cd ${LOGSDIR}; ln -sfn ${PRODUCT_VERSION} latest)
 
 for STAGE in update info base kernel xtools distfiles; do
 	# we don't normally clean these stages
-	(time make ${STAGE} 2>&1) > ${LOGSDIR}/${VERSION}/${STAGE}.log
+	(time make ${STAGE} 2>&1) > ${LOGSDIR}/${PRODUCT_VERSION}/${STAGE}.log
 done
 
 for FLAVOUR in OpenSSL LibreSSL; do
@@ -26,7 +25,7 @@ for FLAVOUR in OpenSSL LibreSSL; do
 		(make clean-packages FLAVOUR=${FLAVOUR} 2>&1) > /dev/null
 	fi
 	(time make packages FLAVOUR=${FLAVOUR} 2>&1) \
-	    > ${LOGSDIR}/${VERSION}/packages-${FLAVOUR}.log
+	    > ${LOGSDIR}/${PRODUCT_VERSION}/packages-${FLAVOUR}.log
 	(time make test FLAVOUR=${FLAVOUR} 2>&1) \
-	    > ${LOGSDIR}/${VERSION}/test-${FLAVOUR}.log
+	    > ${LOGSDIR}/${PRODUCT_VERSION}/test-${FLAVOUR}.log
 done