diff options
-rw-r--r-- | tools/builder_common.sh | 8 | ||||
-rw-r--r-- | tools/builder_defaults.sh | 3 |
2 files changed, 7 insertions, 4 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" \ diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index e5546c3..e1b6512 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -308,11 +308,12 @@ export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+http://pkg.pfsens if [ -n "${_IS_RELEASE}" ]; then export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-"v2_3"} + export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}} export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://release-staging.netgate.com/ce/packages"} else - export USE_PKG_REPO_STAGING="1" export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_0"} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} + export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_DEVEL}} export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-${PKG_REPO_SERVER_DEVEL}} fi |