diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-01 12:17:05 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-01 12:17:05 -0300 |
| commit | f48a09c7062917de946fa677aacc00b7a2257655 (patch) | |
| tree | 61198f9ac5f3e38ce4e22ce46c99724e85671429 /tools/builder_defaults.sh | |
| parent | 6329e1eb7ec2578faf9322d3bc4b98a0a103c9ce (diff) | |
| download | pfsense-f48a09c7062917de946fa677aacc00b7a2257655.zip pfsense-f48a09c7062917de946fa677aacc00b7a2257655.tar.gz | |
Do not add timestamp for release builds
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 8c2188c..d90db84 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -274,9 +274,15 @@ export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} export PKG_REPO_SERVER=${PKG_REPO_SERVER:-"pkg+http://beta.pfsense.org/packages"} export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${GIT_REPO_BRANCH_OR_TAG}"} +if echo "${PRODUCT_VERSION}" | grep -qv -- '-RELEASE'; then + export _IS_RELEASE=yes +else + unset _IS_RELEASE +fi + # Define base package version, based on date for snaps CORE_PKG_VERSION=${PRODUCT_VERSION%%-*} -if echo "${PRODUCT_VERSION}" | grep -qv -- '-RELEASE'; then +if [ -n "${_IS_RELEASE}" ]; then CORE_PKG_VERSION="${CORE_PKG_VERSION}.${DATESTRING}" fi export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/core_pkg"} @@ -292,15 +298,21 @@ export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"} #export custom_package_list="" # General builder output filenames +if [ -n "${_IS_RELEASE}" ]; then + export TIMESTAMP_SUFFIX="" +else + export TIMESTAMP_SUFFIX="-${DATESTRING}" +fi + export UPDATESDIR=${UPDATESDIR:-"${IMAGES_FINAL_DIR}/updates"} -export ISOPATH=${ISOPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-LiveCD-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.iso"} -export MEMSTICKPATH=${MEMSTICKPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img"} -export MEMSTICKSERIALPATH=${MEMSTICKSERIALPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-serial-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img"} -export MEMSTICKADIPATH=${MEMSTICKADIPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-ADI-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.img"} -export OVAPATH=${OVAPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.ova"} +export ISOPATH=${ISOPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-LiveCD-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.iso"} +export MEMSTICKPATH=${MEMSTICKPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.img"} +export MEMSTICKSERIALPATH=${MEMSTICKSERIALPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-serial-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.img"} +export MEMSTICKADIPATH=${MEMSTICKADIPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-memstick-ADI-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.img"} +export OVAPATH=${OVAPATH:-"${IMAGES_FINAL_DIR}/${PRODUCT_NAME}-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.ova"} # set full-update update filename -export UPDATES_TARBALL_FILENAME=${UPDATES_TARBALL_FILENAME:-"${UPDATESDIR}/${PRODUCT_NAME}-Full-Update-${PRODUCT_VERSION}-${TARGET}-${DATESTRING}.tgz"} +export UPDATES_TARBALL_FILENAME=${UPDATES_TARBALL_FILENAME:-"${UPDATESDIR}/${PRODUCT_NAME}-Full-Update-${PRODUCT_VERSION}-${TARGET}${TIMESTAMP_SUFFIX}.tgz"} # Rsync data to send snapshots export RSYNCUSER=${RSYNCUSER:-"snapshots"} |
