opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

scripts/nightly: improve logs set directory structure

This commit is contained in:
Franco Fichtner 2018-09-18 22:51:28 +02:00
parent 30a58b3582
commit deada0aa82
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/common.sh
View File

@ -223,8 +223,8 @@ export DEVICEDIR="${TOOLSDIR}/device"
export PACKAGESDIR="/.pkg"
# define and bootstrap target directories
export TARGETDIRPREFIX="/usr/local/opnsense"
export TARGETDIR="${TARGETDIRPREFIX}/build/${PRODUCT_SETTINGS}/${PRODUCT_ARCH}"
export TARGETDIRPREFIX="/usr/local/opnsense/build"
export TARGETDIR="${TARGETDIRPREFIX}/${PRODUCT_SETTINGS}/${PRODUCT_ARCH}"
export IMAGESDIR="${TARGETDIR}/images"
export LOGSDIR="${TARGETDIR}/logs"
export SETSDIR="${TARGETDIR}/sets"

7
scripts/nightly.sh
View File

@ -2,7 +2,7 @@
# nightly build script
eval "$(make print-LOGSDIR,PRODUCT_VERSION,PRODUCT_ARCH)"
eval "$(make print-LOGSDIR,PRODUCT_ARCH,PRODUCT_VERSION,TARGETDIRPREFIX)"
for RECYCLE in $(cd ${LOGSDIR}; find . -name "[0-9]*" -type f | sort -r | tail -n +7); do
(cd ${LOGSDIR}; rm ${RECYCLE})
@ -28,7 +28,10 @@ for FLAVOUR in OpenSSL LibreSSL; do
done
done
tar -C ${LOGSDIR} -czf ${LOGSDIR}/${PRODUCT_VERSION}-${PRODUCT_ARCH}.tgz ${PRODUCT_VERSION}
tar -C ${TARGETDIRPREFIX} -cjf \
${LOGSDIR}/${PRODUCT_VERSION}-${PRODUCT_ARCH}.txz \
${LOGSDIR##${TARGETDIRPREFIX}/}/${PRODUCT_VERSION}
rm -rf ${LOGSDIR}/latest
mv ${LOGSDIR}/${PRODUCT_VERSION} ${LOGSDIR}/latest