diff options
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | tools/builder_common.sh | 2 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 1 |
3 files changed, 1 insertions, 4 deletions
@@ -330,8 +330,6 @@ if [ -n "${SNAPSHOTS}" ]; then fi if [ -z "${_SKIP_REBUILD_PRESTAGE}" ]; then - [ -n "${CORE_PKG_TMP}" -a -d "${CORE_PKG_TMP}" ] \ - && rm -rf ${CORE_PKG_TMP} [ -n "${CORE_PKG_PATH}" -a -d "${CORE_PKG_PATH}" ] \ && rm -rf ${CORE_PKG_PATH} 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"} |
