summaryrefslogtreecommitdiffstats
path: root/tools/builder_defaults.sh
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-25 10:09:49 -0300
committerRenato Botelho <renato@netgate.com>2015-08-25 14:49:56 -0300
commit64f272035c464b6c9440dbb76e97e638cd63a552 (patch)
tree5519b42e7de4e10af1561f9e5f1308007be2dc28 /tools/builder_defaults.sh
parent328c4fb997501cdb304415629c647db0c0efa5ab (diff)
downloadpfsense-64f272035c464b6c9440dbb76e97e638cd63a552.zip
pfsense-64f272035c464b6c9440dbb76e97e638cd63a552.tar.gz
Rename SRCDIR to FREEBSD_SRC_DIR and change default value to SCRATCHDIR/FreeBSD-src to make build process less intrusive
Diffstat (limited to 'tools/builder_defaults.sh')
-rw-r--r--tools/builder_defaults.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 83268db..dbcd180 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -95,6 +95,7 @@ fi
export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"git@git.pfmechanics.com:pfsense/freebsd-src.git"}
export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"devel"}
export FREEBSD_PARENT_BRANCH=${FREEBSD_PARENT_BRANCH:-"stable/10"}
+export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"}
# Product details
export PRODUCT_NAME=${PRODUCT_NAME:-"pfSense"}
@@ -149,8 +150,6 @@ export STAGE_CHROOT_DIR=${STAGE_CHROOT_DIR:-"${SCRATCHDIR}/stage-dir"}
# 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}"}
-
# 400M is not enough for amd64
export MEMORYDISK_SIZE=${MEMORYDISK_SIZE:-"768M"}
@@ -176,8 +175,8 @@ export OVA_DISKSECTIONALLOCATIONUNITS=${OVA_DISKSECTIONALLOCATIONUNITS:-"1073725
# end of OVF
# Leave this alone.
-export SRC_CONF=${SRC_CONF:-"${SRCDIR}/release/conf/${PRODUCT_NAME}_src.conf"}
-export MAKE_CONF=${MAKE_CONF:-"${SRCDIR}/release/conf/${PRODUCT_NAME}_make.conf"}
+export SRC_CONF=${SRC_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_src.conf"}
+export MAKE_CONF=${MAKE_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_make.conf"}
# Extra tools to be added to ITOOLS
export EXTRA_TOOLS=${EXTRA_TOOLS:-"uuencode uudecode ex"}
OpenPOWER on IntegriCloud