diff options
author | Renato Botelho <renato@netgate.com> | 2016-05-23 14:32:12 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-05-23 14:34:06 -0300 |
commit | 69c97748cde4a5995f998ddb85026b9569c39380 (patch) | |
tree | 599fbb75bbd9aca78dda98dcadf6387533a412be /tools | |
parent | b1952073387c6cd48a32623260285df5d67e11ee (diff) | |
download | pfsense-69c97748cde4a5995f998ddb85026b9569c39380.zip pfsense-69c97748cde4a5995f998ddb85026b9569c39380.tar.gz |
Introduce PRODUCT_REVISION variable to be used in core package version
Diffstat (limited to 'tools')
-rw-r--r-- | tools/builder_defaults.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 25e4163..047be23 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -126,6 +126,7 @@ if [ -z "${PRODUCT_VERSION}" ]; then export PRODUCT_VERSION=$(head -n 1 ${PRODUCT_SRC}/etc/version) fi +export PRODUCT_REVISION=${PRODUCT_REVISION:-""} # Product repository tag to build _cur_git_repo_branch_or_tag=$(git -C ${BUILDER_ROOT} rev-parse --abbrev-ref HEAD) @@ -335,7 +336,7 @@ fi export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-"ssh sign@codesigner.netgate.com sudo ./sign.sh ${PKG_REPO_SIGN_KEY}"} # Define base package version, based on date for snaps -export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}" +export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}${PRODUCT_REVISION:+_}${PRODUCT_REVISION}" export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${TARGET_ARCH}-core"} export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}" export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"} |