From deada0aa82e55e2d7e54e84851def2ed06d6605c Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 18 Sep 2018 22:51:28 +0200 Subject: [PATCH] scripts/nightly: improve logs set directory structure --- build/common.sh | 4 ++-- scripts/nightly.sh | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/common.sh b/build/common.sh index 653ec5e..8f3004e 100644 --- a/build/common.sh +++ b/build/common.sh @@ -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" diff --git a/scripts/nightly.sh b/scripts/nightly.sh index 9b53ffc..8feede1 100755 --- a/scripts/nightly.sh +++ b/scripts/nightly.sh @@ -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