diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-11 11:18:29 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-11 11:30:46 -0200 |
| commit | 26f2e7511c9d4839b5ffb9924f10f81cb1403474 (patch) | |
| tree | befa9dd314d90f722c8132e704f217a61598be6e /tools | |
| parent | c9e18377b703baab4549b3685b5ed9066a2210e5 (diff) | |
| download | pfsense-26f2e7511c9d4839b5ffb9924f10f81cb1403474.zip pfsense-26f2e7511c9d4839b5ffb9924f10f81cb1403474.tar.gz | |
Set some specific rules for RC during build
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 2 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index c6fcee0..5138e00 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -221,7 +221,7 @@ print_error_pfS() { prestage_on_ram_setup() { # Do not use memory disks for release build - if [ -n "${_IS_RELEASE}" ]; then + if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then return fi diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 37d5cc6..3a2d8a7 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -276,6 +276,7 @@ export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/free export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"RELENG_2_3"} unset _IS_RELEASE +unset _IS_RC unset CORE_PKG_DATESTRING export TIMESTAMP_SUFFIX="-${DATESTRING}" # pkg doesn't like - as version separator, use . instead @@ -292,6 +293,7 @@ case "${PRODUCT_VERSION##*-}" in export CORE_PKG_DATESTRING=".b.${PKG_DATESTRING}" ;; RC*) + export _IS_RC=yes export CORE_PKG_DATESTRING=".r.${PKG_DATESTRING}" ;; *) @@ -324,7 +326,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://pkg.pfsense.org"} 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:-"v2_3"} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}} |
