diff options
| author | Renato Botelho <renato@netgate.com> | 2017-08-21 14:40:26 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-08-21 14:40:26 -0300 |
| commit | 47c6eddd3004d36156e2b0b15c29444c52d5aeda (patch) | |
| tree | fe751170f4efc20b453cc4d38b96fccfce67c657 | |
| parent | 67fbf7f7252755cae055bbbc4b668f326ce72ae0 (diff) | |
| download | pfsense-47c6eddd3004d36156e2b0b15c29444c52d5aeda.zip pfsense-47c6eddd3004d36156e2b0b15c29444c52d5aeda.tar.gz | |
Consider RC as RELEASE
| -rw-r--r-- | tools/builder_common.sh | 2 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 2 |
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 cd5a021..b051e11 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}"} |
