diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-11 19:03:20 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-11 19:04:35 -0300 |
| commit | 74a4eefb73788d9d926f8dcfae2e6d929d761130 (patch) | |
| tree | 95da8a35a298d800b6ae51764e07da816e41999e /tools/builder_defaults.sh | |
| parent | 10f2695655c63e52f10363746a68879f423a7810 (diff) | |
| download | pfsense-74a4eefb73788d9d926f8dcfae2e6d929d761130.zip pfsense-74a4eefb73788d9d926f8dcfae2e6d929d761130.tar.gz | |
Explicit define pkg repo variables for release and devel
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 2214537..07306fa 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -275,11 +275,6 @@ export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"} export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"} export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/usr/local/www/beta"} -export PKG_REPO_SERVER=${PKG_REPO_SERVER:-"pkg+http://beta.pfsense.org/packages"} -export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${POUDRIERE_BRANCH}"} - -# Command used to sign pkg repo -export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-""} unset _IS_RELEASE unset CORE_PKG_DATESTRING @@ -305,12 +300,24 @@ case "${PRODUCT_VERSION##*-}" in exit 1 esac -if [ -z "${_IS_RELEASE}" ]; then - export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-$PKG_REPO_SERVER} +# pkg repo variables +export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://release-staging.netgate.com/ce/packages"} +export PKG_REPO_SERVER_DEVEL=${PKG_REPO_SERVER_DEVEL:-"pkg+http://beta.pfsense.org/packages"} +export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+http://pkg.pfsense.org"} + +if [ -n "${_IS_RELEASE}" ]; then + export USE_PKG_REPO_STAGING="1" + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-${POUDRIERE_BRANCH}} + export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-"v2_3"} else - export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+http://pkg.pfsense.org/packages"} + export USE_PKG_REPO_STAGING="" + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_0"} + export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} fi +# Command used to sign pkg repo +export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-""} + # Define base package version, based on date for snaps export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}" export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${TARGET_ARCH}-core"} |
