From 3b9d21e05a37a01fa4abeb237ea50a2367e4d390 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_common.sh | 2 +- tools/builder_defaults.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'tools') 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 ff63827..81e1aec 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_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,7 +293,7 @@ case "${PRODUCT_VERSION##*-}" in export CORE_PKG_DATESTRING=".b.${PKG_DATESTRING}" ;; RC*) - export _IS_RELEASE=yes + export _IS_RC=yes export CORE_PKG_DATESTRING=".r.${PKG_DATESTRING}" ;; *) @@ -325,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}} -- cgit v1.1