diff options
| author | Renato Botelho <renato@netgate.com> | 2016-05-19 13:25:09 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-05-19 13:25:09 -0300 |
| commit | 36dd19fb1194a82392f2da6fd902e5ddf62d2bc8 (patch) | |
| tree | d9b6cd4482866b14c6589c910fca9ebe3a59e846 /tools/builder_defaults.sh | |
| parent | b530335ec4addc5a8d5fcc4d74359de53cdb1845 (diff) | |
| download | pfsense-36dd19fb1194a82392f2da6fd902e5ddf62d2bc8.zip pfsense-36dd19fb1194a82392f2da6fd902e5ddf62d2bc8.tar.gz | |
Use ports branch to define poudriere ports name
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index b9e2493..e64581a 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -275,12 +275,16 @@ STAGING_HOSTNAME=${STAGING_HOSTNAME:-"release-staging.netgate.com"} # Poudriere export ZFS_TANK=${ZFS_TANK:-"zroot"} export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"} -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"} export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"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,') + +export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${POUDRIERE_PORTS_BRANCH}"} + # XXX: Poudriere doesn't like ssh short form case "${POUDRIERE_PORTS_GIT_URL}" in git@*) |
