diff options
author | Renato Botelho <renato@netgate.com> | 2016-04-11 22:38:31 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-04-11 22:39:01 -0300 |
commit | b8e231afa0b600ba32b4390f2d702baeb27756b3 (patch) | |
tree | 8e4b81b7137731726af2c4d4faabaae735c681ea /tools/builder_common.sh | |
parent | f49581947cd9efcc1d727ae256931b2b8680ac08 (diff) | |
download | pfsense-b8e231afa0b600ba32b4390f2d702baeb27756b3.zip pfsense-b8e231afa0b600ba32b4390f2d702baeb27756b3.tar.gz |
Use right repo conf for stage on snaps
Diffstat (limited to 'tools/builder_common.sh')
-rw-r--r-- | tools/builder_common.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 531c83b..d0b871d 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1539,9 +1539,11 @@ setup_pkg_repo() { fi if [ -n "${_staging}" -a -n "${USE_PKG_REPO_STAGING}" ]; then - _pkg_repo_server=${PKG_REPO_SERVER_STAGING} + local _pkg_repo_server=${PKG_REPO_SERVER_STAGING} + local _pkg_repo_branch=${PKG_REPO_BRANCH_STAGING} else - _pkg_repo_server=${PKG_REPO_SERVER_RELEASE} + local _pkg_repo_server=${PKG_REPO_SERVER_RELEASE} + local _pkg_repo_branch=${PKG_REPO_BRANCH_RELEASE} fi mkdir -p $(dirname ${_target}) >/dev/null 2>&1 @@ -1549,7 +1551,7 @@ setup_pkg_repo() { sed \ -e "s/%%ARCH%%/${_target_arch}/" \ -e "s/%%PKG_REPO_BRANCH_DEVEL%%/${PKG_REPO_BRANCH_DEVEL}/g" \ - -e "s/%%PKG_REPO_BRANCH_RELEASE%%/${PKG_REPO_BRANCH_RELEASE}/g" \ + -e "s/%%PKG_REPO_BRANCH_RELEASE%%/${_pkg_repo_branch}/g" \ -e "s,%%PKG_REPO_SERVER_DEVEL%%,${PKG_REPO_SERVER_DEVEL},g" \ -e "s,%%PKG_REPO_SERVER_RELEASE%%,${_pkg_repo_server},g" \ -e "s/%%PRODUCT_NAME%%/${PRODUCT_NAME}/g" \ |