summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-08-21 14:40:26 -0300
committerRenato Botelho <renato@netgate.com>2017-08-21 14:40:29 -0300
commitf3800174aa437bf82f9e3f1061d211304f4b0a33 (patch)
tree2fc87dd2b5576c94fc87095011894a6f768701f8 /tools
parent07884635bc7d9dca1536c64f6a83da513e52730d (diff)
downloadpfsense-f3800174aa437bf82f9e3f1061d211304f4b0a33.zip
pfsense-f3800174aa437bf82f9e3f1061d211304f4b0a33.tar.gz
Consider RC as RELEASE
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_common.sh2
-rw-r--r--tools/builder_defaults.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index b5b504e..1c86116 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -712,7 +712,7 @@ customize_stagearea_for_image() {
# staging server during build phase
if [ -n "${USE_PKG_REPO_STAGING}" ]; then
_read_cmd="select value from repodata where key='packagesite'"
- if [ -n "${_IS_RELEASE}" ]; then
+ if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then
local _tgt_server="${PKG_REPO_SERVER_RELEASE}"
else
local _tgt_server="${PKG_REPO_SERVER_DEVEL}"
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index d372b10..cac0743 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -284,7 +284,7 @@ else
export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_DEVEL}}
fi
-if [ -n "${_IS_RELEASE}" ]; then
+if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then
export PKG_REPO_SIGN_KEY=${PKG_REPO_SIGN_KEY:-"release${PRODUCT_NAME_SUFFIX}"}
else
export PKG_REPO_SIGN_KEY=${PKG_REPO_SIGN_KEY:-"beta${PRODUCT_NAME_SUFFIX}"}
OpenPOWER on IntegriCloud