From ea9d2cd377f22a90795e6874c4d033d0ae98eca6 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Sat, 11 Feb 2017 11:18:29 -0200 Subject: Set some specific rules for RC during build --- tools/builder_defaults.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 9d6c307..d695f02 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -218,6 +218,7 @@ case "${POUDRIERE_PORTS_GIT_URL}" in esac unset _IS_RELEASE +unset _IS_RC unset CORE_PKG_DATESTRING export TIMESTAMP_SUFFIX="-${DATESTRING}" # pkg doesn't like - as version separator, use . instead @@ -234,6 +235,7 @@ case "${PRODUCT_VERSION##*-}" in export CORE_PKG_DATESTRING=".b.${PKG_DATESTRING}" ;; RC*) + export _IS_RC=yes export CORE_PKG_DATESTRING=".r.${PKG_DATESTRING}" ;; *) @@ -265,7 +267,7 @@ export PKG_REPO_SERVER_DEVEL=${PKG_REPO_SERVER_DEVEL:-"pkg+https://beta.pfsense. export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+https://beta.pfsense.org/packages"} export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://${STAGING_HOSTNAME}/ce/packages"} -if [ -n "${_IS_RELEASE}" ]; then +if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}} -- cgit v1.1