summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-25 10:06:18 -0300
committerRenato Botelho <renato@netgate.com>2015-08-25 14:49:56 -0300
commit328c4fb997501cdb304415629c647db0c0efa5ab (patch)
tree9e0f6ba49e525c23c7e25b7d30c63d01e01e6eae /tools
parentc05b4e7d40c432b05b204b8e43b6c1e312deb05f (diff)
downloadpfsense-328c4fb997501cdb304415629c647db0c0efa5ab.zip
pfsense-328c4fb997501cdb304415629c647db0c0efa5ab.tar.gz
Move stage dir and final iso dir to ./tmp to make build process less intrusive
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_defaults.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index b0555bf..83268db 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -143,7 +143,11 @@ export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"git@git.pfmechanics.c
export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"}
# This is where files will be staged
-export STAGE_CHROOT_DIR=${STAGE_CHROOT_DIR:-"/usr/local/stage-dir"}
+export STAGE_CHROOT_DIR=${STAGE_CHROOT_DIR:-"${SCRATCHDIR}/stage-dir"}
+
+# Directory that will clone to in order to create
+# iso staging area.
+export FINAL_CHROOT_DIR=${FINAL_CHROOT_DIR:-"${SCRATCHDIR}/final-dir"}
export SRCDIR=${SRCDIR:-"/usr/${PRODUCT_NAME}src/src.${GIT_REPO_BRANCH_OR_TAG}"}
@@ -236,10 +240,6 @@ export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${GIT_REPO_BRANCH_OR_TAG}"}
#
#export custom_package_list=""
-# Directory that will clone to in order to create
-# iso staging area.
-export FINAL_CHROOT_DIR=${FINAL_CHROOT_DIR:-"/usr/local/final-dir"}
-
# NOTE: Date string is used for creating file names of images
# The file is used for sharing the same value with build_snapshots.sh
local _BUILDER_EPOCH=$(date +"%s")
OpenPOWER on IntegriCloud