diff options
| author | Renato Botelho <renato@netgate.com> | 2016-05-04 18:21:44 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-05-04 18:21:53 -0300 |
| commit | fb4d75d904e9e7f26c83168335b7b51f64be3fd1 (patch) | |
| tree | 7739b57213e3f4dd6df27fbc13f6be5f274bd57b /tools | |
| parent | e274205deaf042c373a771561a8392b17ca8fa6e (diff) | |
| download | pfsense-fb4d75d904e9e7f26c83168335b7b51f64be3fd1.zip pfsense-fb4d75d904e9e7f26c83168335b7b51f64be3fd1.tar.gz | |
Setup devel repo properly for staging
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 979a4e9..e5dc71d 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1545,21 +1545,25 @@ setup_pkg_repo() { fi if [ -n "${_staging}" -a -n "${USE_PKG_REPO_STAGING}" ]; then - local _pkg_repo_server=${PKG_REPO_SERVER_STAGING} - local _pkg_repo_branch=${PKG_REPO_BRANCH_STAGING} + local _pkg_repo_server_devel=${PKG_REPO_SERVER_STAGING} + local _pkg_repo_branch_devel=${PKG_REPO_BRANCH_STAGING} + local _pkg_repo_server_release=${PKG_REPO_SERVER_STAGING} + local _pkg_repo_branch_release=${PKG_REPO_BRANCH_STAGING} else - local _pkg_repo_server=${PKG_REPO_SERVER_RELEASE} - local _pkg_repo_branch=${PKG_REPO_BRANCH_RELEASE} + local _pkg_repo_server_devel=${PKG_REPO_SERVER_DEVEL} + local _pkg_repo_branch_devel=${PKG_REPO_BRANCH_DEVEL} + local _pkg_repo_server_release=${PKG_REPO_SERVER_RELEASE} + local _pkg_repo_branch_release=${PKG_REPO_BRANCH_RELEASE} fi mkdir -p $(dirname ${_target}) >/dev/null 2>&1 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}/g" \ - -e "s,%%PKG_REPO_SERVER_DEVEL%%,${PKG_REPO_SERVER_DEVEL},g" \ - -e "s,%%PKG_REPO_SERVER_RELEASE%%,${_pkg_repo_server},g" \ + -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_SERVER_DEVEL%%,${_pkg_repo_server_devel},g" \ + -e "s,%%PKG_REPO_SERVER_RELEASE%%,${_pkg_repo_server_release},g" \ -e "s/%%PRODUCT_NAME%%/${PRODUCT_NAME}/g" \ ${_template} \ > ${_target} |
