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:32:12 -0300 |
| commit | 81897c42f3b1ac4cca080c4887fd94effca56398 (patch) | |
| tree | 99f33cf1fe8abc34029620232f302d83d7f4f3d5 /tools/builder_defaults.sh | |
| parent | 94d882a03ddf128f7519e54a6c2322ef812590f2 (diff) | |
| download | pfsense-81897c42f3b1ac4cca080c4887fd94effca56398.zip pfsense-81897c42f3b1ac4cca080c4887fd94effca56398.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 8deb017..f812702 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"} |
