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_common.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_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index abe4379..759a1fc 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1864,7 +1864,7 @@ pkg_repo_rsync() { } poudriere_create_patch() { - local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch" + local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch" if [ -z "${FREEBSD_PARENT_BRANCH}" ]; then echo ">>> ERROR: FREEBSD_PARENT_BRANCH is not set" @@ -1938,7 +1938,7 @@ poudriere_jail_name() { fi # Remove arch - echo "${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${_jail_arch##*.}" + echo "${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${_jail_arch##*.}" } poudriere_rename_ports() { @@ -2027,7 +2027,7 @@ poudriere_create_ports_tree() { poudriere_init() { local _error=0 local _archs=$(poudriere_possible_archs) - local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch" + local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch" LOGFILE=${BUILDER_LOGS}/poudriere.log @@ -2159,7 +2159,7 @@ EOF poudriere_update_jails() { local _archs=$(poudriere_possible_archs) - local _jail_patch="${SCRATCHDIR}/poudriere_jail.${GIT_REPO_BRANCH_OR_TAG}.patch" + local _jail_patch="${SCRATCHDIR}/poudriere_jail.${POUDRIERE_BRANCH}.patch" LOGFILE=${BUILDER_LOGS}/poudriere.log @@ -2251,7 +2251,7 @@ poudriere_bulk() { _ref_bulk="${POUDRIERE_BULK}" fi - _bulk=${SCRATCHDIR}/poudriere_bulk.${GIT_REPO_BRANCH_OR_TAG} + _bulk=${SCRATCHDIR}/poudriere_bulk.${POUDRIERE_BRANCH} sed -e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME},g" ${_ref_bulk} > ${_bulk} if ! poudriere bulk -f ${_bulk} -j ${jail_name} -p ${POUDRIERE_PORTS_NAME}; then |
