diff options
| author | Renato Botelho <renato@netgate.com> | 2017-11-20 09:31:03 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-11-20 10:34:03 -0200 |
| commit | 743cc0cc1f840623013ca6e3db80bb60354e7ffa (patch) | |
| tree | 140ea3b5b5af4b110845a20f088a62e55cbe5839 /tools/builder_defaults.sh | |
| parent | 2d982d5b1824d1b77730667842ff3cead64c59d5 (diff) | |
| download | pfsense-743cc0cc1f840623013ca6e3db80bb60354e7ffa.zip pfsense-743cc0cc1f840623013ca6e3db80bb60354e7ffa.tar.gz | |
Reduce the need to always track branch changes for factory
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index ed76dc0..5b48621 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -72,6 +72,13 @@ export PRODUCT_SRC=${PRODUCT_SRC:-"${BUILDER_ROOT}/src"} export PRODUCT_EMAIL=${PRODUCT_EMAIL:-"coreteam@pfsense.org"} export XML_ROOTOBJ=${XML_ROOTOBJ:-$(echo "${PRODUCT_NAME}" | tr '[[:upper:]]' '[[:lower:]]')} +# Add PRODUCT_NAME_SUFFIX string when it's not CE +REPO_BRANCH_PREFIX=${REPO_BRANCH_PREFIX:-""} +if [ "${PRODUCT_NAME_SUFFIX}" != "-CE" -a -z "${REPO_BRANCH_PREFIX}" ]; then + REPO_BRANCH_PREFIX="${PRODUCT_NAME_SUFFIX#-}-" +fi +export REPO_BRANCH_PREFIX + if [ "${PRODUCT_NAME}" = "pfSense" -a "${BUILD_AUTHORIZED_BY_NETGATE}" != "yes" ]; then echo ">>>ERROR: According the following license, only Netgate can build genuine pfSense® software" echo "" @@ -210,7 +217,7 @@ export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"} export POUDRIERE_BULK=${POUDRIERE_BULK:-"${BUILDER_TOOLS}/conf/pfPorts/poudriere_bulk"} export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/freebsd-ports.git"} -export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"} +export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"${REPO_BRANCH_PREFIX}devel"} # Use vX_Y instead of RELENG_X_Y for poudriere to make it shorter POUDRIERE_PORTS_BRANCH=$(echo "${POUDRIERE_PORTS_GIT_BRANCH}" | sed 's,RELENG_,v,') @@ -275,11 +282,11 @@ export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+https://pkg.pfsen export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://${STAGING_HOSTNAME}/ce/packages"} if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then - export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_4_2"} + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"${REPO_BRANCH_PREFIX}v2_4_2"} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}} else - export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_4_2"} + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"${REPO_BRANCH_PREFIX}v2_4_2"} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_DEVEL}} fi |
