summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-25 14:10:42 -0300
committerRenato Botelho <renato@netgate.com>2015-08-25 14:49:58 -0300
commite295b1138d20df97c8f6eab3aec11988778c1f2a (patch)
treea7343d25690489c8509f257d9a8710a5b0f9377d /tools
parent6921fd5ab37337621b63f0ab7902fca95d778a0c (diff)
downloadpfsense-e295b1138d20df97c8f6eab3aec11988778c1f2a.zip
pfsense-e295b1138d20df97c8f6eab3aec11988778c1f2a.tar.gz
Do not set PKG_RSYNC_HOSTNAME automatically
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_common.sh5
-rw-r--r--tools/builder_defaults.sh1
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 7d79216..6378bb3 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1922,6 +1922,11 @@ poudriere_bulk() {
LOGFILE=${BUILDER_LOGS}/poudriere.log
+ if [ -z "${DO_NOT_UPLOAD}" -a -z "${PKG_RSYNC_HOSTNAME}" ]; then
+ echo ">>> ERROR: PKG_RSYNC_HOSTNAME is not set"
+ print_error_pfS
+ fi
+
poudriere_create_ports_tree
[ -d /usr/local/etc/poudriere.d ] || \
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index dc8666d..0aa7461 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -280,7 +280,6 @@ export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"git@git.pfmechanics.c
export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"}
# Host to rsync pkg repos from poudriere
-export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-"beta.pfsense.org"}
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"}
OpenPOWER on IntegriCloud