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:15 -0300 |
| commit | 3c441c09343576fb137be07bcb507e37b427412a (patch) | |
| tree | 9a5db0d148a022a21579e4db75b34dcb45c881f8 /tools/builder_defaults.sh | |
| parent | a3013ca688ce6e8b506fa2a5c6251f77778e39bc (diff) | |
| download | pfsense-3c441c09343576fb137be07bcb507e37b427412a.zip pfsense-3c441c09343576fb137be07bcb507e37b427412a.tar.gz | |
Introduce PRODUCT_REVISION variable to be used in core package version
Diffstat (limited to 'tools/builder_defaults.sh')
| -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 e64581a..4530147 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) @@ -355,7 +356,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"} |
