diff options
author | Renato Botelho <renato@netgate.com> | 2016-03-30 22:03:54 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-03-30 22:03:54 -0300 |
commit | 7761dab55cdad2eb501958798f686eeabb4bcbcb (patch) | |
tree | ed8808ea40d601b72b4fc9a49c25dfcb88e32631 /tools/builder_defaults.sh | |
parent | a2f49238700c0ab70c282673c2b7b70e4aa9bc03 (diff) | |
download | pfsense-7761dab55cdad2eb501958798f686eeabb4bcbcb.zip pfsense-7761dab55cdad2eb501958798f686eeabb4bcbcb.tar.gz |
Replace RELENG_ by v for poudriere to make vol name shorter
Diffstat (limited to 'tools/builder_defaults.sh')
-rw-r--r-- | tools/builder_defaults.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 9e4a00f..b8f4bb6 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -135,6 +135,8 @@ if [ "${_cur_git_repo_branch_or_tag}" = "HEAD" ]; then else export GIT_REPO_BRANCH_OR_TAG="${_cur_git_repo_branch_or_tag}" fi +# Use vX_Y instead of RELENG_X_Y for poudriere to make it shorter +POUDRIERE_BRANCH=$(echo "${GIT_REPO_BRANCH_OR_TAG}" | sed 's,RELENG_,v,') GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed -e 's,/[^/]*$,,') @@ -262,7 +264,7 @@ echo "$BUILTDATESTRING" > $BUILTDATESTRINGFILE # Poudriere export ZFS_TANK=${ZFS_TANK:-"zroot"} export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"} -export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"} +export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${POUDRIERE_BRANCH}"} 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"} @@ -274,7 +276,7 @@ export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"} export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/usr/local/www/beta"} export PKG_REPO_SERVER=${PKG_REPO_SERVER:-"pkg+http://beta.pfsense.org/packages"} -export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${GIT_REPO_BRANCH_OR_TAG}"} +export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${POUDRIERE_BRANCH}"} # Command used to sign pkg repo export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-""} @@ -305,7 +307,7 @@ esac # Define base package version, based on date for snaps export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}" -export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${TARGET_ARCH}-core"} +export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${TARGET_ARCH}-core"} export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}" export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"} |