diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-25 09:39:23 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-25 09:39:23 -0200 |
| commit | 919c84863cbf711b9335cf265771ad8a5fe750e6 (patch) | |
| tree | 5ea190b32d133aa49b85c12a6d3256c0088946ed /tools/builder_defaults.sh | |
| parent | 9447077e3f9e3e90d5afd5aa223348e71cd1350a (diff) | |
| download | pfsense-919c84863cbf711b9335cf265771ad8a5fe750e6.zip pfsense-919c84863cbf711b9335cf265771ad8a5fe750e6.tar.gz | |
Teach build_snapshots to deal with poudriere builds
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 438e300..4d1b448 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -273,6 +273,7 @@ export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"} 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:-"${GIT_REPO_BRANCH_OR_TAG}"} @@ -344,3 +345,13 @@ mkdir -p ${STAGINGAREA} export SNAPSHOTSLOGFILE=${SNAPSHOTSLOGFILE:-"${SCRATCHDIR}/snapshots-build.log"} export SNAPSHOTSLASTUPDATE=${SNAPSHOTSLASTUPDATE:-"${SCRATCHDIR}/snapshots-lastupdate.log"} + +if [ -n "${POUDRIERE_SNAPSHOTS}" ]; then + export SNAPSHOTS_RSYNCIP=${PKG_RSYNC_HOSTNAME} + export SNAPSHOTS_RSYNCUSER=${PKG_RSYNC_USERNAME} + export SNAPSHOTS_RSYNCLOGS=${PKG_RSYNC_LOGS} +else + export SNAPSHOTS_RSYNCIP=${RSYNCIP} + export SNAPSHOTS_RSYNCUSER=${RSYNCUSER} + export SNAPSHOTS_RSYNCLOGS=${RSYNCLOGS} +fi |
