summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-08-02 09:09:13 -0300
committerRenato Botelho <renato@netgate.com>2016-08-02 09:09:13 -0300
commit0d67c72611aff854e612c50106cd3b6858fc7979 (patch)
treeb55c2f4d5a09a1492820d2675e93c6aa778ce96d /tools
parent582f023e32fb51fc8568f6a5b5a6c3b506afa767 (diff)
downloadpfsense-0d67c72611aff854e612c50106cd3b6858fc7979.zip
pfsense-0d67c72611aff854e612c50106cd3b6858fc7979.tar.gz
Stop using CORE_PKG_TMP
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_common.sh2
-rw-r--r--tools/builder_defaults.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 50ef95c..cfe721b 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -899,7 +899,7 @@ clone_to_staging_area() {
cp $SCRATCHDIR/build_commit_info.txt $STAGE_CHROOT_DIR/etc/version.lastcommit
fi
- local _exclude_files="${CORE_PKG_TMP}/base_exclude_files"
+ local _exclude_files="${SCRATCHDIR}/base_exclude_files"
sed \
-e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME},g" \
-e "s,%%VERSION%%,${_version},g" \
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 3167fa6..1357b5f 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -317,7 +317,6 @@ export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}${PRODUCT_R
export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${TARGET_ARCH}-core"}
export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}"
export CORE_PKG_ALL_PATH="${CORE_PKG_PATH}/All"
-export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"}
export PKG_REPO_BASE=${PKG_REPO_BASE:-"${FREEBSD_SRC_DIR}/release/pkg_repos"}
export PKG_REPO_DEFAULT=${PKG_REPO_DEFAULT:-"${PKG_REPO_BASE}/${PRODUCT_NAME}-repo.conf"}
OpenPOWER on IntegriCloud